view tests/test-parentrevspec.out @ 5483:0c43f87baba3 default tip

Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
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^'!