view tests/test-parentrevspec.out @ 5390:36c46e20976a

merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 03 Oct 2007 23:09:36 +0200
parents b111e9a907b1
children
line wrap: on
line source

6:755d1e0d79e9 
5:9ce2ce29723a 3:a3e00c7dbf11 4:bb4475edb621 
4:bb4475edb621 1:5d953a1917d1 
3:a3e00c7dbf11 
2:befc7d89d081 
1:5d953a1917d1 
0:837088b6e1d9 

should work with tag/branch/node/rev
tip^: 5
default^: 5
755d1e0d79e9^: 5
6^: 5

some random lookups
6^^: 3
6^^^: 2
6^^^^: 1
6^^^^^: 0
6^^^^^^: -1
6^1: 5
6^2: abort: unknown revision '6^2'!
6^^2: 4
6^1^2: 4
6^^3: abort: unknown revision '6^^3'!
6~: abort: unknown revision '6~'!
6~1: 5
6~2: 3
6~3: 2
6~4: 1
6~5: 0
6~42: -1
6~1^2: 4
6~1^2~2: 0

with a tag "6^" pointing to rev 1
6^: 1
6^1: 5
6~1: 5
6^^: 3

with a tag "foo^bar" pointing to rev 2
foo^bar: 2
foo^bar^: abort: unknown revision 'foo^bar^'!