Show More
@@ -1,52 +1,79 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | hg init a |
|
3 | hg init a | |
4 | cd a |
|
4 | cd a | |
5 | echo 'root' >root |
|
5 | echo 'root' >root | |
6 | hg add root |
|
6 | hg add root | |
7 | hg commit -d '0 0' -u test -m "Adding root node" |
|
7 | hg commit -d '0 0' -u test -m "Adding root node" | |
8 |
|
8 | |||
9 | echo 'a' >a |
|
9 | echo 'a' >a | |
10 | hg add a |
|
10 | hg add a | |
11 | hg branch a |
|
11 | hg branch a | |
12 | hg commit -d '1 0' -u test -m "Adding a branch" |
|
12 | hg commit -d '1 0' -u test -m "Adding a branch" | |
13 |
|
13 | |||
14 | hg branch q |
|
14 | hg branch q | |
15 | echo 'aa' >a |
|
15 | echo 'aa' >a | |
16 | hg branch -C |
|
16 | hg branch -C | |
17 | hg commit -d '2 0' -u test -m "Adding to a branch" |
|
17 | hg commit -d '2 0' -u test -m "Adding to a branch" | |
18 |
|
18 | |||
19 | hg update -C 0 |
|
19 | hg update -C 0 | |
20 | echo 'b' >b |
|
20 | echo 'b' >b | |
21 | hg add b |
|
21 | hg add b | |
22 | hg branch b |
|
22 | hg branch b | |
23 | hg commit -d '2 0' -u test -m "Adding b branch" |
|
23 | hg commit -d '2 0' -u test -m "Adding b branch" | |
24 |
|
24 | |||
25 | echo 'bh1' >bh1 |
|
25 | echo 'bh1' >bh1 | |
26 | hg add bh1 |
|
26 | hg add bh1 | |
27 | hg commit -d '3 0' -u test -m "Adding b branch head 1" |
|
27 | hg commit -d '3 0' -u test -m "Adding b branch head 1" | |
28 |
|
28 | |||
29 | hg update -C 2 |
|
29 | hg update -C 2 | |
30 | echo 'bh2' >bh2 |
|
30 | echo 'bh2' >bh2 | |
31 | hg add bh2 |
|
31 | hg add bh2 | |
32 | hg commit -d '4 0' -u test -m "Adding b branch head 2" |
|
32 | hg commit -d '4 0' -u test -m "Adding b branch head 2" | |
33 |
|
33 | |||
34 | echo 'c' >c |
|
34 | echo 'c' >c | |
35 | hg add c |
|
35 | hg add c | |
36 | hg branch c |
|
36 | hg branch c | |
37 | hg commit -d '5 0' -u test -m "Adding c branch" |
|
37 | hg commit -d '5 0' -u test -m "Adding c branch" | |
38 |
|
38 | |||
39 | echo 'd' >d |
|
39 | echo 'd' >d | |
40 | hg add d |
|
40 | hg add d | |
41 | hg branch 'a branch name much longer than the default justification used by branches' |
|
41 | hg branch 'a branch name much longer than the default justification used by branches' | |
42 | hg commit -d '6 0' -u test -m "Adding d branch" |
|
42 | hg commit -d '6 0' -u test -m "Adding d branch" | |
43 |
|
43 | |||
44 | hg branches |
|
44 | hg branches | |
45 | echo '-------' |
|
45 | echo '-------' | |
46 | hg branches -a |
|
46 | hg branches -a | |
47 |
|
47 | |||
48 | echo "--- Branch a" |
|
48 | echo "--- Branch a" | |
49 | hg log -b a |
|
49 | hg log -b a | |
50 |
|
50 | |||
51 | echo "---- Branch b" |
|
51 | echo "---- Branch b" | |
52 | hg log -b b |
|
52 | hg log -b b | |
|
53 | ||||
|
54 | echo "---- going to test branch closing" | |||
|
55 | hg branches | |||
|
56 | hg up -C b | |||
|
57 | echo 'xxx1' >> b | |||
|
58 | hg commit -d '7 0' -u test -m 'adding cset to branch b' | |||
|
59 | hg up -C aee39cd168d0 | |||
|
60 | echo 'xxx2' >> b | |||
|
61 | hg commit -d '8 0' -u test -m 'adding head to branch b' | |||
|
62 | echo 'xxx3' >> b | |||
|
63 | hg commit -d '9 0' -u test -m 'adding another cset to branch b' | |||
|
64 | hg branches | |||
|
65 | hg heads | |||
|
66 | hg heads -a | |||
|
67 | hg commit -d '9 0' -u test --close-branch -m 'prune bad branch' | |||
|
68 | hg branches -a | |||
|
69 | hg up -C b | |||
|
70 | hg commit -d '9 0' -u test --close-branch -m 'close this part branch too' | |||
|
71 | echo '--- b branch should be inactive' | |||
|
72 | hg branches | |||
|
73 | hg branches -a | |||
|
74 | echo 'xxx4' >> b | |||
|
75 | hg commit -d '9 0' -u test -m 'reopen branch with a change' | |||
|
76 | echo '--- branch b is back in action' | |||
|
77 | hg branches -a | |||
|
78 | hg heads | |||
|
79 | hg heads -a |
@@ -1,51 +1,150 b'' | |||||
1 | marked working directory as branch a |
|
1 | marked working directory as branch a | |
2 | marked working directory as branch q |
|
2 | marked working directory as branch q | |
3 | reset working directory to branch a |
|
3 | reset working directory to branch a | |
4 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
4 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
5 | marked working directory as branch b |
|
5 | marked working directory as branch b | |
6 | created new head |
|
6 | created new head | |
7 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
7 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
8 | marked working directory as branch c |
|
8 | marked working directory as branch c | |
9 | marked working directory as branch a branch name much longer than the default justification used by branches |
|
9 | marked working directory as branch a branch name much longer than the default justification used by branches | |
10 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
10 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
11 | b 4:aee39cd168d0 |
|
11 | b 4:aee39cd168d0 | |
12 | c 6:589736a22561 (inactive) |
|
12 | c 6:589736a22561 (inactive) | |
13 | a 5:d8cbc61dbaa6 (inactive) |
|
13 | a 5:d8cbc61dbaa6 (inactive) | |
14 | default 0:19709c5a4e75 (inactive) |
|
14 | default 0:19709c5a4e75 (inactive) | |
15 | ------- |
|
15 | ------- | |
16 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 |
|
16 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
17 | b 4:aee39cd168d0 |
|
17 | b 4:aee39cd168d0 | |
18 | --- Branch a |
|
18 | --- Branch a | |
19 | changeset: 5:d8cbc61dbaa6 |
|
19 | changeset: 5:d8cbc61dbaa6 | |
20 | branch: a |
|
20 | branch: a | |
21 | parent: 2:881fe2b92ad0 |
|
21 | parent: 2:881fe2b92ad0 | |
22 | user: test |
|
22 | user: test | |
23 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
23 | date: Thu Jan 01 00:00:04 1970 +0000 | |
24 | summary: Adding b branch head 2 |
|
24 | summary: Adding b branch head 2 | |
25 |
|
25 | |||
26 | changeset: 2:881fe2b92ad0 |
|
26 | changeset: 2:881fe2b92ad0 | |
27 | branch: a |
|
27 | branch: a | |
28 | user: test |
|
28 | user: test | |
29 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
29 | date: Thu Jan 01 00:00:02 1970 +0000 | |
30 | summary: Adding to a branch |
|
30 | summary: Adding to a branch | |
31 |
|
31 | |||
32 | changeset: 1:dd6b440dd85a |
|
32 | changeset: 1:dd6b440dd85a | |
33 | branch: a |
|
33 | branch: a | |
34 | user: test |
|
34 | user: test | |
35 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
35 | date: Thu Jan 01 00:00:01 1970 +0000 | |
36 | summary: Adding a branch |
|
36 | summary: Adding a branch | |
37 |
|
37 | |||
38 | ---- Branch b |
|
38 | ---- Branch b | |
39 | changeset: 4:aee39cd168d0 |
|
39 | changeset: 4:aee39cd168d0 | |
40 | branch: b |
|
40 | branch: b | |
41 | user: test |
|
41 | user: test | |
42 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
42 | date: Thu Jan 01 00:00:03 1970 +0000 | |
43 | summary: Adding b branch head 1 |
|
43 | summary: Adding b branch head 1 | |
44 |
|
44 | |||
45 | changeset: 3:ac22033332d1 |
|
45 | changeset: 3:ac22033332d1 | |
46 | branch: b |
|
46 | branch: b | |
47 | parent: 0:19709c5a4e75 |
|
47 | parent: 0:19709c5a4e75 | |
48 | user: test |
|
48 | user: test | |
49 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
49 | date: Thu Jan 01 00:00:02 1970 +0000 | |
50 | summary: Adding b branch |
|
50 | summary: Adding b branch | |
51 |
|
51 | |||
|
52 | ---- going to test branch closing | |||
|
53 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |||
|
54 | b 4:aee39cd168d0 | |||
|
55 | c 6:589736a22561 (inactive) | |||
|
56 | a 5:d8cbc61dbaa6 (inactive) | |||
|
57 | default 0:19709c5a4e75 (inactive) | |||
|
58 | 2 files updated, 0 files merged, 4 files removed, 0 files unresolved | |||
|
59 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
60 | created new head | |||
|
61 | b 10:bfbe841b666e | |||
|
62 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |||
|
63 | c 6:589736a22561 (inactive) | |||
|
64 | a 5:d8cbc61dbaa6 (inactive) | |||
|
65 | default 0:19709c5a4e75 (inactive) | |||
|
66 | changeset: 10:bfbe841b666e | |||
|
67 | branch: b | |||
|
68 | tag: tip | |||
|
69 | user: test | |||
|
70 | date: Thu Jan 01 00:00:09 1970 +0000 | |||
|
71 | summary: adding another cset to branch b | |||
|
72 | ||||
|
73 | changeset: 8:eebb944467c9 | |||
|
74 | branch: b | |||
|
75 | parent: 4:aee39cd168d0 | |||
|
76 | user: test | |||
|
77 | date: Thu Jan 01 00:00:07 1970 +0000 | |||
|
78 | summary: adding cset to branch b | |||
|
79 | ||||
|
80 | changeset: 7:10ff5895aa57 | |||
|
81 | branch: a branch name much longer than the default justification used by branches | |||
|
82 | user: test | |||
|
83 | date: Thu Jan 01 00:00:06 1970 +0000 | |||
|
84 | summary: Adding d branch | |||
|
85 | ||||
|
86 | changeset: 10:bfbe841b666e | |||
|
87 | branch: b | |||
|
88 | tag: tip | |||
|
89 | user: test | |||
|
90 | date: Thu Jan 01 00:00:09 1970 +0000 | |||
|
91 | summary: adding another cset to branch b | |||
|
92 | ||||
|
93 | changeset: 8:eebb944467c9 | |||
|
94 | branch: b | |||
|
95 | parent: 4:aee39cd168d0 | |||
|
96 | user: test | |||
|
97 | date: Thu Jan 01 00:00:07 1970 +0000 | |||
|
98 | summary: adding cset to branch b | |||
|
99 | ||||
|
100 | changeset: 7:10ff5895aa57 | |||
|
101 | branch: a branch name much longer than the default justification used by branches | |||
|
102 | user: test | |||
|
103 | date: Thu Jan 01 00:00:06 1970 +0000 | |||
|
104 | summary: Adding d branch | |||
|
105 | ||||
|
106 | b 8:eebb944467c9 | |||
|
107 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |||
|
108 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
109 | --- b branch should be inactive | |||
|
110 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |||
|
111 | b 12:2da6583810df (closed) | |||
|
112 | c 6:589736a22561 (inactive) | |||
|
113 | a 5:d8cbc61dbaa6 (inactive) | |||
|
114 | default 0:19709c5a4e75 (inactive) | |||
|
115 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |||
|
116 | --- branch b is back in action | |||
|
117 | b 13:6ac12926b8c3 | |||
|
118 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |||
|
119 | changeset: 13:6ac12926b8c3 | |||
|
120 | branch: b | |||
|
121 | tag: tip | |||
|
122 | user: test | |||
|
123 | date: Thu Jan 01 00:00:09 1970 +0000 | |||
|
124 | summary: reopen branch with a change | |||
|
125 | ||||
|
126 | changeset: 11:c84627f3c15d | |||
|
127 | branch: b | |||
|
128 | user: test | |||
|
129 | date: Thu Jan 01 00:00:09 1970 +0000 | |||
|
130 | summary: prune bad branch | |||
|
131 | ||||
|
132 | changeset: 7:10ff5895aa57 | |||
|
133 | branch: a branch name much longer than the default justification used by branches | |||
|
134 | user: test | |||
|
135 | date: Thu Jan 01 00:00:06 1970 +0000 | |||
|
136 | summary: Adding d branch | |||
|
137 | ||||
|
138 | changeset: 13:6ac12926b8c3 | |||
|
139 | branch: b | |||
|
140 | tag: tip | |||
|
141 | user: test | |||
|
142 | date: Thu Jan 01 00:00:09 1970 +0000 | |||
|
143 | summary: reopen branch with a change | |||
|
144 | ||||
|
145 | changeset: 7:10ff5895aa57 | |||
|
146 | branch: a branch name much longer than the default justification used by branches | |||
|
147 | user: test | |||
|
148 | date: Thu Jan 01 00:00:06 1970 +0000 | |||
|
149 | summary: Adding d branch | |||
|
150 |
@@ -1,495 +1,496 b'' | |||||
1 | % help |
|
1 | % help | |
2 | hg record [OPTION]... [FILE]... |
|
2 | hg record [OPTION]... [FILE]... | |
3 |
|
3 | |||
4 | interactively select changes to commit |
|
4 | interactively select changes to commit | |
5 |
|
5 | |||
6 | If a list of files is omitted, all changes reported by "hg status" |
|
6 | If a list of files is omitted, all changes reported by "hg status" | |
7 | will be candidates for recording. |
|
7 | will be candidates for recording. | |
8 |
|
8 | |||
9 | See 'hg help dates' for a list of formats valid for -d/--date. |
|
9 | See 'hg help dates' for a list of formats valid for -d/--date. | |
10 |
|
10 | |||
11 | You will be prompted for whether to record changes to each |
|
11 | You will be prompted for whether to record changes to each | |
12 | modified file, and for files with multiple changes, for each |
|
12 | modified file, and for files with multiple changes, for each | |
13 | change to use. For each query, the following responses are |
|
13 | change to use. For each query, the following responses are | |
14 | possible: |
|
14 | possible: | |
15 |
|
15 | |||
16 | y - record this change |
|
16 | y - record this change | |
17 | n - skip this change |
|
17 | n - skip this change | |
18 |
|
18 | |||
19 | s - skip remaining changes to this file |
|
19 | s - skip remaining changes to this file | |
20 | f - record remaining changes to this file |
|
20 | f - record remaining changes to this file | |
21 |
|
21 | |||
22 | d - done, skip remaining changes and files |
|
22 | d - done, skip remaining changes and files | |
23 | a - record all changes to all remaining files |
|
23 | a - record all changes to all remaining files | |
24 | q - quit, recording no changes |
|
24 | q - quit, recording no changes | |
25 |
|
25 | |||
26 | ? - display help |
|
26 | ? - display help | |
27 |
|
27 | |||
28 | options: |
|
28 | options: | |
29 |
|
29 | |||
30 | -A --addremove mark new/missing files as added/removed before committing |
|
30 | -A --addremove mark new/missing files as added/removed before committing | |
31 | -I --include include names matching the given patterns |
|
31 | --close-branch mark a branch as closed, hiding it from the branch list | |
32 |
- |
|
32 | -I --include include names matching the given patterns | |
33 | -m --message use <text> as commit message |
|
33 | -X --exclude exclude names matching the given patterns | |
34 | -l --logfile read commit message from <file> |
|
34 | -m --message use <text> as commit message | |
35 | -d --date record datecode as commit date |
|
35 | -l --logfile read commit message from <file> | |
36 |
- |
|
36 | -d --date record datecode as commit date | |
|
37 | -u --user record user as committer | |||
37 |
|
38 | |||
38 | use "hg -v help record" to show global options |
|
39 | use "hg -v help record" to show global options | |
39 | % select no files |
|
40 | % select no files | |
40 | diff --git a/empty-rw b/empty-rw |
|
41 | diff --git a/empty-rw b/empty-rw | |
41 | new file mode 100644 |
|
42 | new file mode 100644 | |
42 | examine changes to 'empty-rw'? [Ynsfdaq?] no changes to record |
|
43 | examine changes to 'empty-rw'? [Ynsfdaq?] no changes to record | |
43 |
|
44 | |||
44 | changeset: -1:000000000000 |
|
45 | changeset: -1:000000000000 | |
45 | tag: tip |
|
46 | tag: tip | |
46 | user: |
|
47 | user: | |
47 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
48 | date: Thu Jan 01 00:00:00 1970 +0000 | |
48 |
|
49 | |||
49 |
|
50 | |||
50 | % select files but no hunks |
|
51 | % select files but no hunks | |
51 | diff --git a/empty-rw b/empty-rw |
|
52 | diff --git a/empty-rw b/empty-rw | |
52 | new file mode 100644 |
|
53 | new file mode 100644 | |
53 | examine changes to 'empty-rw'? [Ynsfdaq?] transaction abort! |
|
54 | examine changes to 'empty-rw'? [Ynsfdaq?] transaction abort! | |
54 | rollback completed |
|
55 | rollback completed | |
55 | abort: empty commit message |
|
56 | abort: empty commit message | |
56 |
|
57 | |||
57 | changeset: -1:000000000000 |
|
58 | changeset: -1:000000000000 | |
58 | tag: tip |
|
59 | tag: tip | |
59 | user: |
|
60 | user: | |
60 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
61 | date: Thu Jan 01 00:00:00 1970 +0000 | |
61 |
|
62 | |||
62 |
|
63 | |||
63 | % record empty file |
|
64 | % record empty file | |
64 | diff --git a/empty-rw b/empty-rw |
|
65 | diff --git a/empty-rw b/empty-rw | |
65 | new file mode 100644 |
|
66 | new file mode 100644 | |
66 | examine changes to 'empty-rw'? [Ynsfdaq?] |
|
67 | examine changes to 'empty-rw'? [Ynsfdaq?] | |
67 | changeset: 0:c0708cf4e46e |
|
68 | changeset: 0:c0708cf4e46e | |
68 | tag: tip |
|
69 | tag: tip | |
69 | user: test |
|
70 | user: test | |
70 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
71 | date: Thu Jan 01 00:00:00 1970 +0000 | |
71 | summary: empty |
|
72 | summary: empty | |
72 |
|
73 | |||
73 |
|
74 | |||
74 | % rename empty file |
|
75 | % rename empty file | |
75 | diff --git a/empty-rw b/empty-rename |
|
76 | diff --git a/empty-rw b/empty-rename | |
76 | rename from empty-rw |
|
77 | rename from empty-rw | |
77 | rename to empty-rename |
|
78 | rename to empty-rename | |
78 | examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] |
|
79 | examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] | |
79 | changeset: 1:df251d174da3 |
|
80 | changeset: 1:df251d174da3 | |
80 | tag: tip |
|
81 | tag: tip | |
81 | user: test |
|
82 | user: test | |
82 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
83 | date: Thu Jan 01 00:00:01 1970 +0000 | |
83 | summary: rename |
|
84 | summary: rename | |
84 |
|
85 | |||
85 |
|
86 | |||
86 | % copy empty file |
|
87 | % copy empty file | |
87 | diff --git a/empty-rename b/empty-copy |
|
88 | diff --git a/empty-rename b/empty-copy | |
88 | copy from empty-rename |
|
89 | copy from empty-rename | |
89 | copy to empty-copy |
|
90 | copy to empty-copy | |
90 | examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] |
|
91 | examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] | |
91 | changeset: 2:b63ea3939f8d |
|
92 | changeset: 2:b63ea3939f8d | |
92 | tag: tip |
|
93 | tag: tip | |
93 | user: test |
|
94 | user: test | |
94 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
95 | date: Thu Jan 01 00:00:02 1970 +0000 | |
95 | summary: copy |
|
96 | summary: copy | |
96 |
|
97 | |||
97 |
|
98 | |||
98 | % delete empty file |
|
99 | % delete empty file | |
99 | diff --git a/empty-copy b/empty-copy |
|
100 | diff --git a/empty-copy b/empty-copy | |
100 | deleted file mode 100644 |
|
101 | deleted file mode 100644 | |
101 | examine changes to 'empty-copy'? [Ynsfdaq?] |
|
102 | examine changes to 'empty-copy'? [Ynsfdaq?] | |
102 | changeset: 3:a2546574bce9 |
|
103 | changeset: 3:a2546574bce9 | |
103 | tag: tip |
|
104 | tag: tip | |
104 | user: test |
|
105 | user: test | |
105 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
106 | date: Thu Jan 01 00:00:03 1970 +0000 | |
106 | summary: delete |
|
107 | summary: delete | |
107 |
|
108 | |||
108 |
|
109 | |||
109 | % add binary file |
|
110 | % add binary file | |
110 | 1 changesets found |
|
111 | 1 changesets found | |
111 | diff --git a/tip.bundle b/tip.bundle |
|
112 | diff --git a/tip.bundle b/tip.bundle | |
112 | new file mode 100644 |
|
113 | new file mode 100644 | |
113 | this is a binary file |
|
114 | this is a binary file | |
114 | examine changes to 'tip.bundle'? [Ynsfdaq?] |
|
115 | examine changes to 'tip.bundle'? [Ynsfdaq?] | |
115 | changeset: 4:9e998a545a8b |
|
116 | changeset: 4:9e998a545a8b | |
116 | tag: tip |
|
117 | tag: tip | |
117 | user: test |
|
118 | user: test | |
118 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
119 | date: Thu Jan 01 00:00:04 1970 +0000 | |
119 | summary: binary |
|
120 | summary: binary | |
120 |
|
121 | |||
121 | diff -r a2546574bce9 -r 9e998a545a8b tip.bundle |
|
122 | diff -r a2546574bce9 -r 9e998a545a8b tip.bundle | |
122 | Binary file tip.bundle has changed |
|
123 | Binary file tip.bundle has changed | |
123 |
|
124 | |||
124 | % change binary file |
|
125 | % change binary file | |
125 | 1 changesets found |
|
126 | 1 changesets found | |
126 | diff --git a/tip.bundle b/tip.bundle |
|
127 | diff --git a/tip.bundle b/tip.bundle | |
127 | this modifies a binary file (all or nothing) |
|
128 | this modifies a binary file (all or nothing) | |
128 | examine changes to 'tip.bundle'? [Ynsfdaq?] |
|
129 | examine changes to 'tip.bundle'? [Ynsfdaq?] | |
129 | changeset: 5:93d05561507d |
|
130 | changeset: 5:93d05561507d | |
130 | tag: tip |
|
131 | tag: tip | |
131 | user: test |
|
132 | user: test | |
132 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
133 | date: Thu Jan 01 00:00:05 1970 +0000 | |
133 | summary: binary-change |
|
134 | summary: binary-change | |
134 |
|
135 | |||
135 | diff -r 9e998a545a8b -r 93d05561507d tip.bundle |
|
136 | diff -r 9e998a545a8b -r 93d05561507d tip.bundle | |
136 | Binary file tip.bundle has changed |
|
137 | Binary file tip.bundle has changed | |
137 |
|
138 | |||
138 | % rename and change binary file |
|
139 | % rename and change binary file | |
139 | 1 changesets found |
|
140 | 1 changesets found | |
140 | diff --git a/tip.bundle b/top.bundle |
|
141 | diff --git a/tip.bundle b/top.bundle | |
141 | rename from tip.bundle |
|
142 | rename from tip.bundle | |
142 | rename to top.bundle |
|
143 | rename to top.bundle | |
143 | this modifies a binary file (all or nothing) |
|
144 | this modifies a binary file (all or nothing) | |
144 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] |
|
145 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] | |
145 | changeset: 6:699cc1bea9aa |
|
146 | changeset: 6:699cc1bea9aa | |
146 | tag: tip |
|
147 | tag: tip | |
147 | user: test |
|
148 | user: test | |
148 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
149 | date: Thu Jan 01 00:00:06 1970 +0000 | |
149 | summary: binary-change-rename |
|
150 | summary: binary-change-rename | |
150 |
|
151 | |||
151 | diff -r 93d05561507d -r 699cc1bea9aa tip.bundle |
|
152 | diff -r 93d05561507d -r 699cc1bea9aa tip.bundle | |
152 | Binary file tip.bundle has changed |
|
153 | Binary file tip.bundle has changed | |
153 | diff -r 93d05561507d -r 699cc1bea9aa top.bundle |
|
154 | diff -r 93d05561507d -r 699cc1bea9aa top.bundle | |
154 | Binary file top.bundle has changed |
|
155 | Binary file top.bundle has changed | |
155 |
|
156 | |||
156 | % add plain file |
|
157 | % add plain file | |
157 | diff --git a/plain b/plain |
|
158 | diff --git a/plain b/plain | |
158 | new file mode 100644 |
|
159 | new file mode 100644 | |
159 | examine changes to 'plain'? [Ynsfdaq?] |
|
160 | examine changes to 'plain'? [Ynsfdaq?] | |
160 | changeset: 7:118ed744216b |
|
161 | changeset: 7:118ed744216b | |
161 | tag: tip |
|
162 | tag: tip | |
162 | user: test |
|
163 | user: test | |
163 | date: Thu Jan 01 00:00:07 1970 +0000 |
|
164 | date: Thu Jan 01 00:00:07 1970 +0000 | |
164 | summary: plain |
|
165 | summary: plain | |
165 |
|
166 | |||
166 | diff -r 699cc1bea9aa -r 118ed744216b plain |
|
167 | diff -r 699cc1bea9aa -r 118ed744216b plain | |
167 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
168 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
168 | +++ b/plain Thu Jan 01 00:00:07 1970 +0000 |
|
169 | +++ b/plain Thu Jan 01 00:00:07 1970 +0000 | |
169 | @@ -0,0 +1,10 @@ |
|
170 | @@ -0,0 +1,10 @@ | |
170 | +1 |
|
171 | +1 | |
171 | +2 |
|
172 | +2 | |
172 | +3 |
|
173 | +3 | |
173 | +4 |
|
174 | +4 | |
174 | +5 |
|
175 | +5 | |
175 | +6 |
|
176 | +6 | |
176 | +7 |
|
177 | +7 | |
177 | +8 |
|
178 | +8 | |
178 | +9 |
|
179 | +9 | |
179 | +10 |
|
180 | +10 | |
180 |
|
181 | |||
181 | % modify end of plain file |
|
182 | % modify end of plain file | |
182 | diff --git a/plain b/plain |
|
183 | diff --git a/plain b/plain | |
183 | 1 hunks, 1 lines changed |
|
184 | 1 hunks, 1 lines changed | |
184 | examine changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@ |
|
185 | examine changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@ | |
185 | 8 |
|
186 | 8 | |
186 | 9 |
|
187 | 9 | |
187 | 10 |
|
188 | 10 | |
188 | +11 |
|
189 | +11 | |
189 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL |
|
190 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL | |
190 | diff --git a/plain b/plain |
|
191 | diff --git a/plain b/plain | |
191 | 1 hunks, 1 lines changed |
|
192 | 1 hunks, 1 lines changed | |
192 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@ |
|
193 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@ | |
193 | 9 |
|
194 | 9 | |
194 | 10 |
|
195 | 10 | |
195 | 11 |
|
196 | 11 | |
196 | +cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
197 | +cf81a2760718a74d44c0c2eecb72f659e63a69c5 | |
197 | \ No newline at end of file |
|
198 | \ No newline at end of file | |
198 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL |
|
199 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL | |
199 | diff --git a/plain b/plain |
|
200 | diff --git a/plain b/plain | |
200 | 1 hunks, 2 lines changed |
|
201 | 1 hunks, 2 lines changed | |
201 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@ |
|
202 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@ | |
202 | 9 |
|
203 | 9 | |
203 | 10 |
|
204 | 10 | |
204 | 11 |
|
205 | 11 | |
205 | -cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
206 | -cf81a2760718a74d44c0c2eecb72f659e63a69c5 | |
206 | \ No newline at end of file |
|
207 | \ No newline at end of file | |
207 | +cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
208 | +cf81a2760718a74d44c0c2eecb72f659e63a69c5 | |
208 | record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both |
|
209 | record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both | |
209 | diff --git a/plain b/plain |
|
210 | diff --git a/plain b/plain | |
210 | 2 hunks, 4 lines changed |
|
211 | 2 hunks, 4 lines changed | |
211 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@ |
|
212 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@ | |
212 | -1 |
|
213 | -1 | |
213 | +2 |
|
214 | +2 | |
214 | 2 |
|
215 | 2 | |
215 | 3 |
|
216 | 3 | |
216 | 4 |
|
217 | 4 | |
217 | record this change to 'plain'? [Ynsfdaq?] @@ -8,5 +8,3 @@ |
|
218 | record this change to 'plain'? [Ynsfdaq?] @@ -8,5 +8,3 @@ | |
218 | 8 |
|
219 | 8 | |
219 | 9 |
|
220 | 9 | |
220 | 10 |
|
221 | 10 | |
221 | -11 |
|
222 | -11 | |
222 | -cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
223 | -cf81a2760718a74d44c0c2eecb72f659e63a69c5 | |
223 | record this change to 'plain'? [Ynsfdaq?] |
|
224 | record this change to 'plain'? [Ynsfdaq?] | |
224 | changeset: 11:d09ab1967dab |
|
225 | changeset: 11:d09ab1967dab | |
225 | tag: tip |
|
226 | tag: tip | |
226 | user: test |
|
227 | user: test | |
227 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
228 | date: Thu Jan 01 00:00:10 1970 +0000 | |
228 | summary: begin-and-end |
|
229 | summary: begin-and-end | |
229 |
|
230 | |||
230 | diff -r e2ecd9b0b78d -r d09ab1967dab plain |
|
231 | diff -r e2ecd9b0b78d -r d09ab1967dab plain | |
231 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
232 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 | |
232 | +++ b/plain Thu Jan 01 00:00:10 1970 +0000 |
|
233 | +++ b/plain Thu Jan 01 00:00:10 1970 +0000 | |
233 | @@ -1,4 +1,4 @@ |
|
234 | @@ -1,4 +1,4 @@ | |
234 | -1 |
|
235 | -1 | |
235 | +2 |
|
236 | +2 | |
236 | 2 |
|
237 | 2 | |
237 | 3 |
|
238 | 3 | |
238 | 4 |
|
239 | 4 | |
239 | @@ -8,5 +8,3 @@ |
|
240 | @@ -8,5 +8,3 @@ | |
240 | 8 |
|
241 | 8 | |
241 | 9 |
|
242 | 9 | |
242 | 10 |
|
243 | 10 | |
243 | -11 |
|
244 | -11 | |
244 | -cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
245 | -cf81a2760718a74d44c0c2eecb72f659e63a69c5 | |
245 |
|
246 | |||
246 | % trim beginning, modify end |
|
247 | % trim beginning, modify end | |
247 | % record end |
|
248 | % record end | |
248 | diff --git a/plain b/plain |
|
249 | diff --git a/plain b/plain | |
249 | 2 hunks, 5 lines changed |
|
250 | 2 hunks, 5 lines changed | |
250 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@ |
|
251 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@ | |
251 | -2 |
|
252 | -2 | |
252 | -2 |
|
253 | -2 | |
253 | -3 |
|
254 | -3 | |
254 | 4 |
|
255 | 4 | |
255 | 5 |
|
256 | 5 | |
256 | 6 |
|
257 | 6 | |
257 | 7 |
|
258 | 7 | |
258 | 8 |
|
259 | 8 | |
259 | 9 |
|
260 | 9 | |
260 | record this change to 'plain'? [Ynsfdaq?] @@ -4,7 +1,7 @@ |
|
261 | record this change to 'plain'? [Ynsfdaq?] @@ -4,7 +1,7 @@ | |
261 | 4 |
|
262 | 4 | |
262 | 5 |
|
263 | 5 | |
263 | 6 |
|
264 | 6 | |
264 | 7 |
|
265 | 7 | |
265 | 8 |
|
266 | 8 | |
266 | 9 |
|
267 | 9 | |
267 | -10 |
|
268 | -10 | |
268 | +10.new |
|
269 | +10.new | |
269 | record this change to 'plain'? [Ynsfdaq?] |
|
270 | record this change to 'plain'? [Ynsfdaq?] | |
270 | changeset: 12:44516c9708ae |
|
271 | changeset: 12:44516c9708ae | |
271 | tag: tip |
|
272 | tag: tip | |
272 | user: test |
|
273 | user: test | |
273 | date: Thu Jan 01 00:00:11 1970 +0000 |
|
274 | date: Thu Jan 01 00:00:11 1970 +0000 | |
274 | summary: end-only |
|
275 | summary: end-only | |
275 |
|
276 | |||
276 | diff -r d09ab1967dab -r 44516c9708ae plain |
|
277 | diff -r d09ab1967dab -r 44516c9708ae plain | |
277 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
278 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 | |
278 | +++ b/plain Thu Jan 01 00:00:11 1970 +0000 |
|
279 | +++ b/plain Thu Jan 01 00:00:11 1970 +0000 | |
279 | @@ -7,4 +7,4 @@ |
|
280 | @@ -7,4 +7,4 @@ | |
280 | 7 |
|
281 | 7 | |
281 | 8 |
|
282 | 8 | |
282 | 9 |
|
283 | 9 | |
283 | -10 |
|
284 | -10 | |
284 | +10.new |
|
285 | +10.new | |
285 |
|
286 | |||
286 | % record beginning |
|
287 | % record beginning | |
287 | diff --git a/plain b/plain |
|
288 | diff --git a/plain b/plain | |
288 | 1 hunks, 3 lines changed |
|
289 | 1 hunks, 3 lines changed | |
289 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@ |
|
290 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@ | |
290 | -2 |
|
291 | -2 | |
291 | -2 |
|
292 | -2 | |
292 | -3 |
|
293 | -3 | |
293 | 4 |
|
294 | 4 | |
294 | 5 |
|
295 | 5 | |
295 | 6 |
|
296 | 6 | |
296 | record this change to 'plain'? [Ynsfdaq?] |
|
297 | record this change to 'plain'? [Ynsfdaq?] | |
297 | changeset: 13:3ebbace64a8d |
|
298 | changeset: 13:3ebbace64a8d | |
298 | tag: tip |
|
299 | tag: tip | |
299 | user: test |
|
300 | user: test | |
300 | date: Thu Jan 01 00:00:12 1970 +0000 |
|
301 | date: Thu Jan 01 00:00:12 1970 +0000 | |
301 | summary: begin-only |
|
302 | summary: begin-only | |
302 |
|
303 | |||
303 | diff -r 44516c9708ae -r 3ebbace64a8d plain |
|
304 | diff -r 44516c9708ae -r 3ebbace64a8d plain | |
304 | --- a/plain Thu Jan 01 00:00:11 1970 +0000 |
|
305 | --- a/plain Thu Jan 01 00:00:11 1970 +0000 | |
305 | +++ b/plain Thu Jan 01 00:00:12 1970 +0000 |
|
306 | +++ b/plain Thu Jan 01 00:00:12 1970 +0000 | |
306 | @@ -1,6 +1,3 @@ |
|
307 | @@ -1,6 +1,3 @@ | |
307 | -2 |
|
308 | -2 | |
308 | -2 |
|
309 | -2 | |
309 | -3 |
|
310 | -3 | |
310 | 4 |
|
311 | 4 | |
311 | 5 |
|
312 | 5 | |
312 | 6 |
|
313 | 6 | |
313 |
|
314 | |||
314 | % add to beginning, trim from end |
|
315 | % add to beginning, trim from end | |
315 | % record end |
|
316 | % record end | |
316 | diff --git a/plain b/plain |
|
317 | diff --git a/plain b/plain | |
317 | 2 hunks, 4 lines changed |
|
318 | 2 hunks, 4 lines changed | |
318 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@ |
|
319 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@ | |
319 | +1 |
|
320 | +1 | |
320 | +2 |
|
321 | +2 | |
321 | +3 |
|
322 | +3 | |
322 | 4 |
|
323 | 4 | |
323 | 5 |
|
324 | 5 | |
324 | 6 |
|
325 | 6 | |
325 | 7 |
|
326 | 7 | |
326 | 8 |
|
327 | 8 | |
327 | 9 |
|
328 | 9 | |
328 | record this change to 'plain'? [Ynsfdaq?] @@ -1,7 +4,6 @@ |
|
329 | record this change to 'plain'? [Ynsfdaq?] @@ -1,7 +4,6 @@ | |
329 | 4 |
|
330 | 4 | |
330 | 5 |
|
331 | 5 | |
331 | 6 |
|
332 | 6 | |
332 | 7 |
|
333 | 7 | |
333 | 8 |
|
334 | 8 | |
334 | 9 |
|
335 | 9 | |
335 | -10.new |
|
336 | -10.new | |
336 | record this change to 'plain'? [Ynsfdaq?] % add to beginning, middle, end |
|
337 | record this change to 'plain'? [Ynsfdaq?] % add to beginning, middle, end | |
337 | % record beginning, middle |
|
338 | % record beginning, middle | |
338 | diff --git a/plain b/plain |
|
339 | diff --git a/plain b/plain | |
339 | 3 hunks, 7 lines changed |
|
340 | 3 hunks, 7 lines changed | |
340 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@ |
|
341 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@ | |
341 | +1 |
|
342 | +1 | |
342 | +2 |
|
343 | +2 | |
343 | +3 |
|
344 | +3 | |
344 | 4 |
|
345 | 4 | |
345 | 5 |
|
346 | 5 | |
346 | record this change to 'plain'? [Ynsfdaq?] @@ -1,6 +4,8 @@ |
|
347 | record this change to 'plain'? [Ynsfdaq?] @@ -1,6 +4,8 @@ | |
347 | 4 |
|
348 | 4 | |
348 | 5 |
|
349 | 5 | |
349 | +5.new |
|
350 | +5.new | |
350 | +5.reallynew |
|
351 | +5.reallynew | |
351 | 6 |
|
352 | 6 | |
352 | 7 |
|
353 | 7 | |
353 | 8 |
|
354 | 8 | |
354 | 9 |
|
355 | 9 | |
355 | record this change to 'plain'? [Ynsfdaq?] @@ -3,4 +8,6 @@ |
|
356 | record this change to 'plain'? [Ynsfdaq?] @@ -3,4 +8,6 @@ | |
356 | 6 |
|
357 | 6 | |
357 | 7 |
|
358 | 7 | |
358 | 8 |
|
359 | 8 | |
359 | 9 |
|
360 | 9 | |
360 | +10 |
|
361 | +10 | |
361 | +11 |
|
362 | +11 | |
362 | record this change to 'plain'? [Ynsfdaq?] |
|
363 | record this change to 'plain'? [Ynsfdaq?] | |
363 | changeset: 15:c1c639d8b268 |
|
364 | changeset: 15:c1c639d8b268 | |
364 | tag: tip |
|
365 | tag: tip | |
365 | user: test |
|
366 | user: test | |
366 | date: Thu Jan 01 00:00:14 1970 +0000 |
|
367 | date: Thu Jan 01 00:00:14 1970 +0000 | |
367 | summary: middle-only |
|
368 | summary: middle-only | |
368 |
|
369 | |||
369 | diff -r efc0dad7bd9f -r c1c639d8b268 plain |
|
370 | diff -r efc0dad7bd9f -r c1c639d8b268 plain | |
370 | --- a/plain Thu Jan 01 00:00:13 1970 +0000 |
|
371 | --- a/plain Thu Jan 01 00:00:13 1970 +0000 | |
371 | +++ b/plain Thu Jan 01 00:00:14 1970 +0000 |
|
372 | +++ b/plain Thu Jan 01 00:00:14 1970 +0000 | |
372 | @@ -1,5 +1,10 @@ |
|
373 | @@ -1,5 +1,10 @@ | |
373 | +1 |
|
374 | +1 | |
374 | +2 |
|
375 | +2 | |
375 | +3 |
|
376 | +3 | |
376 | 4 |
|
377 | 4 | |
377 | 5 |
|
378 | 5 | |
378 | +5.new |
|
379 | +5.new | |
379 | +5.reallynew |
|
380 | +5.reallynew | |
380 | 6 |
|
381 | 6 | |
381 | 7 |
|
382 | 7 | |
382 | 8 |
|
383 | 8 | |
383 |
|
384 | |||
384 | % record end |
|
385 | % record end | |
385 | diff --git a/plain b/plain |
|
386 | diff --git a/plain b/plain | |
386 | 1 hunks, 2 lines changed |
|
387 | 1 hunks, 2 lines changed | |
387 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@ |
|
388 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@ | |
388 | 7 |
|
389 | 7 | |
389 | 8 |
|
390 | 8 | |
390 | 9 |
|
391 | 9 | |
391 | +10 |
|
392 | +10 | |
392 | +11 |
|
393 | +11 | |
393 | record this change to 'plain'? [Ynsfdaq?] |
|
394 | record this change to 'plain'? [Ynsfdaq?] | |
394 | changeset: 16:80b74bbc7808 |
|
395 | changeset: 16:80b74bbc7808 | |
395 | tag: tip |
|
396 | tag: tip | |
396 | user: test |
|
397 | user: test | |
397 | date: Thu Jan 01 00:00:15 1970 +0000 |
|
398 | date: Thu Jan 01 00:00:15 1970 +0000 | |
398 | summary: end-only |
|
399 | summary: end-only | |
399 |
|
400 | |||
400 | diff -r c1c639d8b268 -r 80b74bbc7808 plain |
|
401 | diff -r c1c639d8b268 -r 80b74bbc7808 plain | |
401 | --- a/plain Thu Jan 01 00:00:14 1970 +0000 |
|
402 | --- a/plain Thu Jan 01 00:00:14 1970 +0000 | |
402 | +++ b/plain Thu Jan 01 00:00:15 1970 +0000 |
|
403 | +++ b/plain Thu Jan 01 00:00:15 1970 +0000 | |
403 | @@ -9,3 +9,5 @@ |
|
404 | @@ -9,3 +9,5 @@ | |
404 | 7 |
|
405 | 7 | |
405 | 8 |
|
406 | 8 | |
406 | 9 |
|
407 | 9 | |
407 | +10 |
|
408 | +10 | |
408 | +11 |
|
409 | +11 | |
409 |
|
410 | |||
410 | adding subdir/a |
|
411 | adding subdir/a | |
411 | diff --git a/subdir/a b/subdir/a |
|
412 | diff --git a/subdir/a b/subdir/a | |
412 | 1 hunks, 1 lines changed |
|
413 | 1 hunks, 1 lines changed | |
413 | examine changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@ |
|
414 | examine changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@ | |
414 | a |
|
415 | a | |
415 | +a |
|
416 | +a | |
416 | record this change to 'subdir/a'? [Ynsfdaq?] |
|
417 | record this change to 'subdir/a'? [Ynsfdaq?] | |
417 | changeset: 18:33ff5c4fb017 |
|
418 | changeset: 18:33ff5c4fb017 | |
418 | tag: tip |
|
419 | tag: tip | |
419 | user: test |
|
420 | user: test | |
420 | date: Thu Jan 01 00:00:16 1970 +0000 |
|
421 | date: Thu Jan 01 00:00:16 1970 +0000 | |
421 | summary: subdir-change |
|
422 | summary: subdir-change | |
422 |
|
423 | |||
423 | diff -r aecf2b2ea83c -r 33ff5c4fb017 subdir/a |
|
424 | diff -r aecf2b2ea83c -r 33ff5c4fb017 subdir/a | |
424 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
425 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 | |
425 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
426 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 | |
426 | @@ -1,1 +1,2 @@ |
|
427 | @@ -1,1 +1,2 @@ | |
427 | a |
|
428 | a | |
428 | +a |
|
429 | +a | |
429 |
|
430 | |||
430 | % help, quit |
|
431 | % help, quit | |
431 | diff --git a/subdir/f1 b/subdir/f1 |
|
432 | diff --git a/subdir/f1 b/subdir/f1 | |
432 | 1 hunks, 1 lines changed |
|
433 | 1 hunks, 1 lines changed | |
433 | examine changes to 'subdir/f1'? [Ynsfdaq?] y - record this change |
|
434 | examine changes to 'subdir/f1'? [Ynsfdaq?] y - record this change | |
434 | n - skip this change |
|
435 | n - skip this change | |
435 | s - skip remaining changes to this file |
|
436 | s - skip remaining changes to this file | |
436 | f - record remaining changes to this file |
|
437 | f - record remaining changes to this file | |
437 | d - done, skip remaining changes and files |
|
438 | d - done, skip remaining changes and files | |
438 | a - record all changes to all remaining files |
|
439 | a - record all changes to all remaining files | |
439 | q - quit, recording no changes |
|
440 | q - quit, recording no changes | |
440 | ? - display help |
|
441 | ? - display help | |
441 | examine changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit |
|
442 | examine changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit | |
442 | % skip |
|
443 | % skip | |
443 | diff --git a/subdir/f1 b/subdir/f1 |
|
444 | diff --git a/subdir/f1 b/subdir/f1 | |
444 | 1 hunks, 1 lines changed |
|
445 | 1 hunks, 1 lines changed | |
445 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 |
|
446 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | |
446 | 1 hunks, 1 lines changed |
|
447 | 1 hunks, 1 lines changed | |
447 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected |
|
448 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected | |
448 | % no |
|
449 | % no | |
449 | diff --git a/subdir/f1 b/subdir/f1 |
|
450 | diff --git a/subdir/f1 b/subdir/f1 | |
450 | 1 hunks, 1 lines changed |
|
451 | 1 hunks, 1 lines changed | |
451 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 |
|
452 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | |
452 | 1 hunks, 1 lines changed |
|
453 | 1 hunks, 1 lines changed | |
453 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected |
|
454 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected | |
454 | % f, quit |
|
455 | % f, quit | |
455 | diff --git a/subdir/f1 b/subdir/f1 |
|
456 | diff --git a/subdir/f1 b/subdir/f1 | |
456 | 1 hunks, 1 lines changed |
|
457 | 1 hunks, 1 lines changed | |
457 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 |
|
458 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | |
458 | 1 hunks, 1 lines changed |
|
459 | 1 hunks, 1 lines changed | |
459 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit |
|
460 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit | |
460 | % s, all |
|
461 | % s, all | |
461 | diff --git a/subdir/f1 b/subdir/f1 |
|
462 | diff --git a/subdir/f1 b/subdir/f1 | |
462 | 1 hunks, 1 lines changed |
|
463 | 1 hunks, 1 lines changed | |
463 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 |
|
464 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | |
464 | 1 hunks, 1 lines changed |
|
465 | 1 hunks, 1 lines changed | |
465 | examine changes to 'subdir/f2'? [Ynsfdaq?] |
|
466 | examine changes to 'subdir/f2'? [Ynsfdaq?] | |
466 | changeset: 20:094183e04b7c |
|
467 | changeset: 20:094183e04b7c | |
467 | tag: tip |
|
468 | tag: tip | |
468 | user: test |
|
469 | user: test | |
469 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
470 | date: Thu Jan 01 00:00:18 1970 +0000 | |
470 | summary: x |
|
471 | summary: x | |
471 |
|
472 | |||
472 | diff -r f9e855cd9374 -r 094183e04b7c subdir/f2 |
|
473 | diff -r f9e855cd9374 -r 094183e04b7c subdir/f2 | |
473 | --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 |
|
474 | --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 | |
474 | +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 |
|
475 | +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 | |
475 | @@ -1,1 +1,2 @@ |
|
476 | @@ -1,1 +1,2 @@ | |
476 | b |
|
477 | b | |
477 | +b |
|
478 | +b | |
478 |
|
479 | |||
479 | % f |
|
480 | % f | |
480 | diff --git a/subdir/f1 b/subdir/f1 |
|
481 | diff --git a/subdir/f1 b/subdir/f1 | |
481 | 1 hunks, 1 lines changed |
|
482 | 1 hunks, 1 lines changed | |
482 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
483 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
483 | changeset: 21:38164785b0ef |
|
484 | changeset: 21:38164785b0ef | |
484 | tag: tip |
|
485 | tag: tip | |
485 | user: test |
|
486 | user: test | |
486 | date: Thu Jan 01 00:00:19 1970 +0000 |
|
487 | date: Thu Jan 01 00:00:19 1970 +0000 | |
487 | summary: y |
|
488 | summary: y | |
488 |
|
489 | |||
489 | diff -r 094183e04b7c -r 38164785b0ef subdir/f1 |
|
490 | diff -r 094183e04b7c -r 38164785b0ef subdir/f1 | |
490 | --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 |
|
491 | --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 | |
491 | +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 |
|
492 | +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 | |
492 | @@ -1,1 +1,2 @@ |
|
493 | @@ -1,1 +1,2 @@ | |
493 | a |
|
494 | a | |
494 | +a |
|
495 | +a | |
495 |
|
496 |
General Comments 0
You need to be logged in to leave comments.
Login now