What I did:
1. Created a projects with the following structure. Project1 and
Project2 have been branched from the trunk
Project
* Trunk
* Tags
* Branches
o Project1
o Project2
2. Changed an existing file in Project 1 to add the line "test" at the
bottom.
3. Committed the change to Project1
4. Merged Project 1 with Project 2 with the 'Merge a range of revisions'
function selecting 'all revisions'
5. Committed the merge
6. Edit the same file in Project 2 to remove the line 'test'
7. Commit the change to Project 2
8. Merge Project 2 with Project 1 with the Merge a range of revisions
function selecting 'all revisions'
What I expect:
File in Project 1 should have the line 'test' removed.
What actually happened:
Line 'test' remains in Project 1 even though it should be removed in the
last revision when Project 2 merges to Project 1.
I suspect that Project2 is determining that since it has two commits,
one adding a line and the other removing it, that there's no total delta
to be applied to Project 1
Shaun Darvell
Application & Environment Services
ICT Digital Channels & Corporate Applications
ICT SOLUTIONS GROUP Department of Veterans' Affairs
* (02) 6225 4664
E Shaun.Darvell_at_dva.gov.au
E Curam Support - ACT (CuramSupport_at_dva.gov.au)
______________________________________________________________________
IMPORTANT
1. Before opening any attachments, please check for viruses.
2. This e-mail (including any attachments) may contain confidential information
for the intended recipient. If you are not the intended recipient,
please contact the sender and delete all copies of this email.
3. Any views expressed in this e-mail are those of the sender and are not
a statement of Australian Government Policy unless otherwise stated.
4. Electronic addresses published in this email are not conspicuous publications and DVA does not consent to the receipt of commercial electronic messages.
5. To unsubscribe from emails from the Department of Veterans' Affairs (DVA) please go to
http://www.dva.gov.au/contact_us/Pages/feedback.aspx
, and advise which mailing list you would like to unsubscribe from.
6. Finally, please do not remove this notice.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3060987
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-07-22 15:15:08 CEST