How to recovery from a file accidentally committed twice?

Marc Haber mh+vcs-home at zugschlus.de
Tue Aug 17 21:53:25 CEST 2021


On Tue, Aug 17, 2021 at 08:30:40PM +0100, Klaus Ethgen wrote:
> Am Di den 17. Aug 2021 um 19:06 schrieb Marc Haber:
> > one second of not paying attention did it, and I accidentally committed
> > a file that is in one vcsh-repository, bin/foo to a second vcsh
> > repository. Now both repos are fighting about that file. vcsh bar rm
> > bin/foo just took the fight to another limit?
> > 
> > How do I recover, telling the wrong repository to completely forget about the file?
> 
> vcsh bar rm --cached bin/foo

First I had to re-add and re-commit the file, to be able to re-remove
--cached it. And additionally some manual invervention on the other
systems that had this repository cheecked out (stash, update, stash
clear).

But without your help I would still be trying. Thanks!

Greetings
Marc

-- 
-----------------------------------------------------------------------------
Marc Haber         | "I don't trust Computers. They | Mailadresse im Header
Leimen, Germany    |  lose things."    Winona Ryder | Fon: *49 6224 1600402
Nordisch by Nature |  How to make an American Quilt | Fax: *49 6224 1600421


More information about the vcs-home mailing list