Re: Can I remove stg sync --undo ?

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Jul 4, 2008, 22:05 UTC
Message-ID: <b0943d9e0807041505oc15660bpcd62a62100e517b9@mail.gmail.com>
In-Reply-To: <20080704020918.GA30669@diana.vm.bytemark.co.uk>

2008/7/4 Karl Hasselström <kha@treskal.com>:

Show 14 quoted lines

> On 2008-07-03 23:02:28 +0100, Catalin Marinas wrote:
>> The sync performs three operations - push, merge and refresh (if the
>> refresh is automatic after merge, it doesn't update the backup
>> information since it was done by merge).
>>
>> If merge fails, the refresh is manual after solving the conflicts. I
>> suspect this will be recorded as a separate step for undo
>
> Yeah, the new undo stuff will currently handle sync just like e.g.
> push and pop: write one log entry when the command's all done, plus
> one extra just before the conflicting push if there is one. So you can
> always undo the entire command; and in case of conflicts, you also
> have the option of undoing just the conflicting push. Is this enough
> for sync?

There are two operations that can conflict for sync - pushing a patch and the actual sync'ing, i.e. a three-way merge with the patch to be synchronised with (kind of fold).

>> (BTW, is resolved take into account for undo?).
>
> Hmmm, what do you mean by "resolved"?

The current resolved command - the clearing of the conflicting entries in the index.

-- 
Catalin