From mh+vcs-home at zugschlus.de  Tue Aug 17 20:06:35 2021
From: mh+vcs-home at zugschlus.de (Marc Haber)
Date: Tue, 17 Aug 2021 20:06:35 +0200
Subject: How to recovery from a file accidentally committed twice?
Message-ID: <YRv6q9rqDJmcXGyK@torres.zugschlus.de>

Hi,

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?

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

From Klaus+mlvcsh at ethgen.de  Tue Aug 17 21:30:40 2021
From: Klaus+mlvcsh at ethgen.de (Klaus Ethgen)
Date: Tue, 17 Aug 2021 20:30:40 +0100
Subject: How to recovery from a file accidentally committed twice?
In-Reply-To: <YRv6q9rqDJmcXGyK@torres.zugschlus.de>
References: <YRv6q9rqDJmcXGyK@torres.zugschlus.de>
Message-ID: <YRwOYEzvOYxhoK+4@ikki.ethgen.ch>

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

Gru?
   Klaus
-- 
Klaus Ethgen                                       http://www.ethgen.ch/
pub  4096R/4E20AF1C 2011-05-16            Klaus Ethgen <Klaus at Ethgen.ch>
Fingerprint: 85D4 CA42 952C 949B 1753  62B3 79D0 B06F 4E20 AF1C
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 688 bytes
Desc: not available
URL: <http://lists.madduck.net/pipermail/vcs-home/attachments/20210817/44e33f3c/attachment.sig>

From mh+vcs-home at zugschlus.de  Tue Aug 17 21:53:25 2021
From: mh+vcs-home at zugschlus.de (Marc Haber)
Date: Tue, 17 Aug 2021 21:53:25 +0200
Subject: How to recovery from a file accidentally committed twice?
In-Reply-To: <YRwOYEzvOYxhoK+4@ikki.ethgen.ch>
References: <YRv6q9rqDJmcXGyK@torres.zugschlus.de>
 <YRwOYEzvOYxhoK+4@ikki.ethgen.ch>
Message-ID: <YRwTtWGbV8Xw+m2d@torres.zugschlus.de>

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