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

Bug: Revision from which branch was created shows as not emrged

From: Adam Conway <adam.conway_at_carus.com>
Date: Mon, 14 Aug 2017 06:12:42 -0700 (PDT)

To reproduce:

1. Create a branch branches/foo
2. Commit something to it. Let's say this gets revision 100
3. Right-click in working copy and select Show Log
4. Right-click top revision on that branch and choose Create branch/tag (so we are creating from that specific revision, not from repo top) and create branches/bar
5. Commit some else to branches/foo (revision 101)
6. Checkout branches/bar
7. In branches/bar, right click, select SVN Merge
8. Click next to get to "Merge revision range" screen
9. Click Show log
10. Check Stop on copy/rename

Expected: I have one revision showing as mergable (r101) since the branch was created from r100 and includes it's changes

Actual: Both r101 and r100 show as mergable.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3286093

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-08-14 15:13:57 CEST

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