[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Re: Interactive conflict resolving in the cmdline client

From: Peter Lundblad <plundblad_at_google.com>
Date: 2007-02-12 12:42:45 CET

Folker Schamel writes:
> Peter Lundblad wrote:
> Does you mean the following:
> File A may have conflicted by merging in r1000,
> and r2000 is never merged in.
> File B successfully has merged in r1000 and r2000.
> Is this correct?
>
Yes.

> But usually, r2000 of A and r2000 of B need each other.
> This means, if you manually have resolved the conflict in file A,
> then you cannot compile and test your work,
> because B includes r2000, but A does not include r2000 yet.
> Is this right?
>

You can't sometimes, so you need to restart the merge where it left
(note that this is all done in a local WC without commits in
between). But the question of interactive or not doesn't change that,
does it?

Thanks,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 12 12:43:29 2007

This is an archived mail posted to the Subversion Dev mailing list.