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

How to continue an aborted merge operation

From: Sebastian Bauer <mail_at_sebastianbauer.info>
Date: Tue, 16 Feb 2010 11:58:25 +0100


It is possible to continue an interrupted merge operation at the point, where
the operation was actually interrupted? The interruption may happen due to a
bad internet connection, for instance. If I simply reissue the same merge
command the whole merge process is restarted.

This behavior IMO has at least two problems. For one, if the internet
connection stays unstable, the chance that merge operation will soon be
completed stays small. Also, as the merge operation is applied more than once,
the result is not the same as for the single (successful) merge operation, as
differences are applied more than once (verified this at least in conflicting
situation), so one should revert the erroneous merge before issuing a new one.

Is there a way to circumvent this?

Thanks a lot!

Received on 2010-02-16 11:59:02 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.