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

RE: Some revisions missed/skipped during SVN merge

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Wed, 6 May 2015 17:21:27 -0700 (PDT)

On 5/05/2015 08:35, richard.a.mills quoth:
> Procedure:
> 1.Checkout clean working copy of Release2
> 2.Use TortoiseSVN > Merge … > range of revisions
> 3.Select "specific range" with "Show Log"
> 4.Pick the set of revisions since the last merge which are indicated as
> non-greyed out
> 5.If necessary, edit the range field to be full range "xxxx-yyyy"
> instead of "xxx, b, c, d-yyy".
> 6.Execute the merge into local working copy
> 7.Commit the merge to Release2 branch
> In most situations, this succeeds. In other situations, *some of the
> revisions in the xxx-yyy range will not be merged*. The files in the
> missing revisions don't get the changes and the revisions are not
> recorded as being merged when viewing history of the newly committed
> Release2. Often we miss this, only to discover it later when we find
> missing code. With large merges, it's often difficult to determine that
> certain files or revisions have been missed.

How many revisions are committed to Release1 between merges?

By default when you open the log window it will only load the last 100 commits. If whoever is doing the merge forgets to load extra commits, they might "miss" some of the non-greyed commits that were further down.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-05-07 02:21:30 CEST

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