Show More
@@ -1,17 +1,23 b'' | |||||
1 | #!/bin/sh |
|
1 | Just exercize debugindexdot | |
|
2 | Create a short file history including a merge. | |||
|
3 | $ hg init t | |||
|
4 | $ cd t | |||
|
5 | $ echo a > a | |||
|
6 | $ hg ci -qAm t1 -d '0 0' | |||
|
7 | $ echo a >> a | |||
|
8 | $ hg ci -m t2 -d '1 0' | |||
|
9 | $ hg up -qC 0 | |||
|
10 | $ echo b >> a | |||
|
11 | $ hg ci -m t3 -d '2 0' | |||
|
12 | created new head | |||
|
13 | $ HGMERGE=true hg merge -q | |||
|
14 | $ hg ci -m merge -d '3 0' | |||
2 |
|
15 | |||
3 | # Just exercize debugindexdot |
|
16 | $ hg debugindexdot .hg/store/data/a.i | |
4 | # Create a short file history including a merge. |
|
17 | digraph G { | |
5 | hg init t |
|
18 | -1 -> 0 | |
6 | cd t |
|
19 | 0 -> 1 | |
7 | echo a > a |
|
20 | 0 -> 2 | |
8 | hg ci -qAm t1 -d '0 0' |
|
21 | 2 -> 3 | |
9 | echo a >> a |
|
22 | 1 -> 3 | |
10 | hg ci -m t2 -d '1 0' |
|
23 | } | |
11 | hg up -qC 0 |
|
|||
12 | echo b >> a |
|
|||
13 | hg ci -m t3 -d '2 0' |
|
|||
14 | HGMERGE=true hg merge -q |
|
|||
15 | hg ci -m merge -d '3 0' |
|
|||
16 |
|
||||
17 | hg debugindexdot .hg/store/data/a.i |
|
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now