Show More
| @@ -1,43 +1,87 b'' | |||||
| 1 | #!/bin/sh |
|
1 | $ hg init | |
|
|
2 | ||||
|
|
3 | $ echo foo > foo | |||
|
|
4 | $ echo bar > bar | |||
|
|
5 | $ hg ci -qAm 'add foo bar' | |||
| 2 |
|
6 | |||
| 3 | hg init repo |
|
7 | $ echo foo2 >> foo | |
| 4 | cd repo |
|
8 | $ echo bleh > bar | |
|
|
9 | $ hg ci -m 'change foo bar' | |||
| 5 |
|
10 | |||
| 6 | echo foo > foo |
|
11 | $ hg up -qC 0 | |
| 7 | echo bar > bar |
|
12 | $ hg mv foo foo1 | |
| 8 | hg ci -qAm 'add foo bar' |
|
13 | $ echo foo1 > foo1 | |
|
|
14 | $ hg cat foo >> foo1 | |||
|
|
15 | $ hg ci -m 'mv foo foo1' | |||
|
|
16 | created new head | |||
| 9 |
|
17 | |||
| 10 | echo foo2 >> foo |
|
18 | $ hg merge | |
| 11 | echo bleh > bar |
|
19 | merging foo1 and foo to foo1 | |
| 12 | hg ci -m 'change foo bar' |
|
20 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
|
|
21 | (branch merge, don't forget to commit) | |||
|
|
22 | ||||
|
|
23 | $ hg debugstate --nodates | |||
|
|
24 | n 0 -2 bar | |||
|
|
25 | m 644 14 foo1 | |||
|
|
26 | copy: foo -> foo1 | |||
| 13 |
|
27 | |||
| 14 | hg up -qC 0 |
|
28 | $ hg st -q | |
| 15 | hg mv foo foo1 |
|
29 | M bar | |
| 16 | echo foo1 > foo1 |
|
30 | M foo1 | |
| 17 | hg cat foo >> foo1 |
|
31 | ||
| 18 | hg ci -m 'mv foo foo1' |
|
32 | ||
|
|
33 | Removing foo1 and bar: | |||
|
|
34 | ||||
|
|
35 | $ cp foo1 F | |||
|
|
36 | $ cp bar B | |||
|
|
37 | $ hg rm -f foo1 bar | |||
|
|
38 | ||||
|
|
39 | $ hg debugstate --nodates | |||
|
|
40 | r 0 -2 bar | |||
|
|
41 | r 0 -1 foo1 | |||
|
|
42 | copy: foo -> foo1 | |||
| 19 |
|
43 | |||
| 20 | hg merge |
|
44 | $ hg st -qC | |
| 21 | hg debugstate --nodates |
|
45 | R bar | |
| 22 | hg st -q |
|
46 | R foo1 | |
|
|
47 | ||||
|
|
48 | ||||
|
|
49 | Re-adding foo1 and bar: | |||
| 23 |
|
50 | |||
| 24 | echo '% removing foo1 and bar' |
|
51 | $ cp F foo1 | |
| 25 | cp foo1 F |
|
52 | $ cp B bar | |
| 26 | cp bar B |
|
53 | $ hg add -v foo1 bar | |
| 27 | hg rm -f foo1 bar |
|
54 | adding bar | |
| 28 | hg debugstate --nodates |
|
55 | adding foo1 | |
| 29 | hg st -qC |
|
56 | ||
|
|
57 | $ hg debugstate --nodates | |||
|
|
58 | n 0 -2 bar | |||
|
|
59 | m 644 14 foo1 | |||
|
|
60 | copy: foo -> foo1 | |||
| 30 |
|
61 | |||
| 31 | echo '% readding foo1 and bar' |
|
62 | $ hg st -qC | |
| 32 | cp F foo1 |
|
63 | M bar | |
| 33 | cp B bar |
|
64 | M foo1 | |
| 34 | hg add -v foo1 bar |
|
65 | foo | |
| 35 | hg debugstate --nodates |
|
66 | ||
| 36 | hg st -qC |
|
67 | ||
|
|
68 | Reverting foo1 and bar: | |||
| 37 |
|
69 | |||
| 38 | echo '% reverting foo1 and bar' |
|
70 | $ hg revert -vr . foo1 bar | |
| 39 | hg revert -vr . foo1 bar |
|
71 | saving current version of bar as bar.orig | |
| 40 | hg debugstate --nodates |
|
72 | reverting bar | |
| 41 | hg st -qC |
|
73 | saving current version of foo1 as foo1.orig | |
| 42 | hg diff |
|
74 | reverting foo1 | |
| 43 |
|
75 | |||
|
|
76 | $ hg debugstate --nodates | |||
|
|
77 | n 0 -2 bar | |||
|
|
78 | m 644 14 foo1 | |||
|
|
79 | copy: foo -> foo1 | |||
|
|
80 | ||||
|
|
81 | $ hg st -qC | |||
|
|
82 | M bar | |||
|
|
83 | M foo1 | |||
|
|
84 | foo | |||
|
|
85 | ||||
|
|
86 | $ hg diff | |||
|
|
87 | ||||
| 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