Mercurial > hg
view tests/test-convert-svn-tags.out @ 6933:17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:
$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other
and will again be expanded on commit.
Demonstrate in test case.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Fri, 22 Aug 2008 08:26:18 +0200 |
parents | 6ec941b6003d |
children | 90d8dfb481e7 |
line wrap: on
line source
% initial svn import Adding projA/branches Adding projA/tags Adding projA/trunk Adding projA/unrelated Committed revision 1. % update svn repository A A/trunk A A/unrelated A A/branches A A/tags Checked out revision 1. A trunk/a Adding trunk/a Transmitting file data . Committed revision 2. Sending trunk/a Transmitting file data . Committed revision 3. Sending trunk/a Transmitting file data . Committed revision 4. A unrelated/dummy Adding unrelated/dummy Transmitting file data . Committed revision 5. % tag current revision At revision 5. A tags/trunk.v1 A tags/trunk.badtag Adding tags/trunk.badtag Adding tags/trunk.v1 Committed revision 6. Sending trunk/a Transmitting file data . Committed revision 7. % fix the bad tag At revision 7. A tags/trunk.goodtag D tags/trunk.badtag/a D tags/trunk.badtag Deleting tags/trunk.badtag Adding tags/trunk.goodtag Committed revision 8. % convert initializing destination A-hg repository scanning source... sorting... converting... 4 init projA 3 adda 2 changea 1 changea2 0 changea3 updating tags o 5 update tags tags: tip | o 4 changea3 tags: | o 3 changea2 tags: trunk.v1 trunk.goodtag | o 2 changea tags: | o 1 adda tags: | o 0 init projA tags: tip trunk.v1 trunk.goodtag % convert without tags initializing destination A-notags-hg repository scanning source... sorting... converting... 4 init projA 3 adda 2 changea 1 changea2 0 changea3 tip