Mercurial > hg
annotate tests/test-graft.t @ 18796:fa6d5c62f3bd
pathcomplete: complete directories more conservatively
Suppose we want to perform a single-level completion (i.e. without
--full) of "fi" in a repo containing "fee", "fie/dead", "fie/live",
and "foe".
If we give back "fie/" as the only answer, the shell will consider
the completion to be unambiguous, and will append a space after the
completion. We can't complete "fie/live" or "fie/dead" without
first backspacing over that space.
We used to thus create two fake names, "fie/a" and "fie/b", to force
the shell to consider the completion to be ambiguous. It would then
stop at "fie/" without appending a space, allowing us to hit tab
again to complete "fie/live" or "fie/dead".
The change here arises from realising that we only need to force
the shell to consider a completion as ambiguous if we have exactly
one directory and zero files as possible completions.
This prevents spurious names from showing up as possible completions
when they don't need to be invented in the first place.
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Thu, 21 Mar 2013 22:10:54 -0700 |
parents | 76b69cccb07a |
children | e078ea9b4ce4 |
rev | line source |
---|---|
15361 | 1 Create a repo with some stuff in it: |
2 | |
3 $ hg init a | |
4 $ cd a | |
5 $ echo a > a | |
6 $ echo a > d | |
7 $ echo a > e | |
8 $ hg ci -qAm0 | |
9 $ echo b > a | |
10 $ hg ci -m1 -u bar | |
11 $ hg mv a b | |
12 $ hg ci -m2 | |
13 $ hg cp b c | |
14 $ hg ci -m3 -u baz | |
15 $ echo b > d | |
16 $ echo f > e | |
17 $ hg ci -m4 | |
18 $ hg up -q 3 | |
19 $ echo b > e | |
20 $ hg branch -q stable | |
21 $ hg ci -m5 | |
22 $ hg merge -q default --tool internal:local | |
23 $ hg branch -q default | |
24 $ hg ci -m6 | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
25 $ hg phase --public 3 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
26 $ hg phase --force --secret 6 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
27 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
28 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n' |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
29 @ test@6.secret: 6 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
30 |\ |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
31 | o test@5.draft: 5 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
32 | | |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
33 o | test@4.draft: 4 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
34 |/ |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
35 o baz@3.public: 3 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
36 | |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
37 o test@2.public: 2 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
38 | |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
39 o bar@1.public: 1 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
40 | |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
41 o test@0.public: 0 |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
42 |
15361 | 43 |
44 Need to specify a rev: | |
45 | |
46 $ hg graft | |
47 abort: no revisions specified | |
48 [255] | |
49 | |
50 Can't graft ancestor: | |
51 | |
52 $ hg graft 1 2 | |
53 skipping ancestor revision 1 | |
54 skipping ancestor revision 2 | |
55 [255] | |
56 | |
16992
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
57 Specify revisions with -r: |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
58 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
59 $ hg graft -r 1 -r 2 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
60 skipping ancestor revision 1 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
61 skipping ancestor revision 2 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
62 [255] |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
63 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
64 $ hg graft -r 1 2 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
65 skipping ancestor revision 2 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
66 skipping ancestor revision 1 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
67 [255] |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
68 |
15361 | 69 Can't graft with dirty wd: |
70 | |
71 $ hg up -q 0 | |
72 $ echo foo > a | |
73 $ hg graft 1 | |
74 abort: outstanding uncommitted changes | |
75 [255] | |
76 $ hg revert a | |
77 | |
78 Graft a rename: | |
79 | |
80 $ hg graft 2 -u foo | |
81 grafting revision 2 | |
82 merging a and b to b | |
83 $ hg export tip --git | |
84 # HG changeset patch | |
85 # User foo | |
86 # Date 0 0 | |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
18631
diff
changeset
|
87 # Thu Jan 01 00:00:00 1970 +0000 |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
88 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82 |
15361 | 89 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e |
90 2 | |
91 | |
92 diff --git a/a b/b | |
93 rename from a | |
94 rename to b | |
95 | |
96 Look for extra:source | |
97 | |
98 $ hg log --debug -r tip | |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
99 changeset: 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82 |
15361 | 100 tag: tip |
15907
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15777
diff
changeset
|
101 phase: draft |
15361 | 102 parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e |
103 parent: -1:0000000000000000000000000000000000000000 | |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
104 manifest: 7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb |
15361 | 105 user: foo |
106 date: Thu Jan 01 00:00:00 1970 +0000 | |
107 files+: b | |
108 files-: a | |
109 extra: branch=default | |
110 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4 | |
111 description: | |
112 2 | |
113 | |
114 | |
115 | |
116 Graft out of order, skipping a merge and a duplicate | |
117 | |
16389
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
118 $ hg graft 1 5 4 3 'merge()' 2 -n |
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
119 skipping ungraftable merge revision 6 |
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
120 skipping already grafted revision 2 |
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
121 grafting revision 1 |
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
122 grafting revision 5 |
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
123 grafting revision 4 |
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
124 grafting revision 3 |
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
125 |
15361 | 126 $ hg graft 1 5 4 3 'merge()' 2 --debug |
127 skipping ungraftable merge revision 6 | |
128 scanning for duplicate grafts | |
129 skipping already grafted revision 2 | |
130 grafting revision 1 | |
131 searching for copies back to rev 1 | |
132 unmatched files in local: | |
133 b | |
16795
e9ae770eff1c
merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16660
diff
changeset
|
134 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
18135
a6fe1b9cc68f
copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents:
17186
diff
changeset
|
135 src: 'a' -> dst: 'b' * |
15361 | 136 checking for directory renames |
137 resolving manifests | |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
138 branchmerge: True, force: True, partial: False |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
139 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
15361 | 140 b: local copied/moved to a -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18360
diff
changeset
|
141 preserving b for resolve of b |
15361 | 142 updating: b 1/1 files (100.00%) |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
143 picked tool 'internal:merge' for b (binary False symlink False) |
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
144 merging b and a to b |
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
145 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
146 premerge successful |
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
147 b |
15361 | 148 grafting revision 5 |
149 searching for copies back to rev 1 | |
150 resolving manifests | |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
151 branchmerge: True, force: True, partial: False |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
152 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
15361 | 153 e: remote is newer -> g |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
154 getting e |
15361 | 155 updating: e 1/1 files (100.00%) |
156 e | |
157 grafting revision 4 | |
158 searching for copies back to rev 1 | |
159 resolving manifests | |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
160 branchmerge: True, force: True, partial: False |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
161 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
18360
760c0d67ce5e
merge: process files in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18135
diff
changeset
|
162 d: remote is newer -> g |
15361 | 163 e: versions differ -> m |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18360
diff
changeset
|
164 preserving e for resolve of e |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
165 getting d |
15361 | 166 updating: d 1/2 files (50.00%) |
167 updating: e 2/2 files (100.00%) | |
168 picked tool 'internal:merge' for e (binary False symlink False) | |
169 merging e | |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
170 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
15361 | 171 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15361
diff
changeset
|
172 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
15361 | 173 abort: unresolved conflicts, can't continue |
174 (use hg resolve and hg graft --continue) | |
175 [255] | |
176 | |
177 Continue without resolve should fail: | |
178 | |
179 $ hg graft -c | |
180 grafting revision 4 | |
181 abort: unresolved merge conflicts (see hg help resolve) | |
182 [255] | |
183 | |
184 Fix up: | |
185 | |
186 $ echo b > e | |
187 $ hg resolve -m e | |
188 | |
189 Continue with a revision should fail: | |
190 | |
191 $ hg graft -c 6 | |
192 abort: can't specify --continue and revisions | |
193 [255] | |
194 | |
16992
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
195 $ hg graft -c -r 6 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
196 abort: can't specify --continue and revisions |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
197 [255] |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
198 |
15361 | 199 Continue for real, clobber usernames |
200 | |
201 $ hg graft -c -U | |
202 grafting revision 4 | |
203 grafting revision 3 | |
204 | |
205 Compare with original: | |
206 | |
207 $ hg diff -r 6 | |
208 $ hg status --rev 0:. -C | |
209 M d | |
210 M e | |
211 A b | |
212 a | |
213 A c | |
214 a | |
215 R a | |
216 | |
217 View graph: | |
218 | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
219 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n' |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
220 @ test@11.draft: 3 |
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
221 | |
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
222 o test@10.draft: 4 |
15361 | 223 | |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
224 o test@9.draft: 5 |
15361 | 225 | |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
226 o bar@8.draft: 1 |
15361 | 227 | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
228 o foo@7.draft: 2 |
15361 | 229 | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
230 | o test@6.secret: 6 |
15361 | 231 | |\ |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
232 | | o test@5.draft: 5 |
15361 | 233 | | | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
234 | o | test@4.draft: 4 |
15361 | 235 | |/ |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
236 | o baz@3.public: 3 |
15361 | 237 | | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
238 | o test@2.public: 2 |
15361 | 239 | | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
240 | o bar@1.public: 1 |
15361 | 241 |/ |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
242 o test@0.public: 0 |
15361 | 243 |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
244 Graft again onto another branch should preserve the original source |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
245 $ hg up -q 0 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
246 $ echo 'g'>g |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
247 $ hg add g |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
248 $ hg ci -m 7 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
249 created new head |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
250 $ hg graft 7 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
251 grafting revision 7 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
252 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
253 $ hg log -r 7 --template '{rev}:{node}\n' |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
254 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82 |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
255 $ hg log -r 2 --template '{rev}:{node}\n' |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
256 2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
257 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
258 $ hg log --debug -r tip |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
259 changeset: 13:9db0f28fd3747e92c57d015f53b5593aeec53c2d |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
260 tag: tip |
15907
51fc43253a52
changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15777
diff
changeset
|
261 phase: draft |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
262 parent: 12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
263 parent: -1:0000000000000000000000000000000000000000 |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
264 manifest: 13:dc313617b8c32457c0d589e0dbbedfe71f3cd637 |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
265 user: foo |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
266 date: Thu Jan 01 00:00:00 1970 +0000 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
267 files+: b |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
268 files-: a |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
269 extra: branch=default |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
270 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
271 description: |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
272 2 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
273 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
274 |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
275 Disallow grafting an already grafted cset onto its original branch |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
276 $ hg up -q 6 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
277 $ hg graft 7 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
278 skipping already grafted revision 7 (was grafted from 2) |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
279 [255] |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
280 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
281 Disallow grafting already grafted csets with the same origin onto each other |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
282 $ hg up -q 13 |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
283 $ hg graft 2 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
284 skipping already grafted revision 2 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
285 [255] |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
286 $ hg graft 7 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
287 skipping already grafted revision 7 (same origin 2) |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
288 [255] |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
289 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
290 $ hg up -q 7 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
291 $ hg graft 2 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
292 skipping already grafted revision 2 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
293 [255] |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
294 $ hg graft tip |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
295 skipping already grafted revision 13 (same origin 2) |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
296 [255] |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
297 |
16660
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
298 Graft with --log |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
299 |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
300 $ hg up -Cq 1 |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
301 $ hg graft 3 --log -u foo |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
302 grafting revision 3 |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
303 warning: can't find ancestor for 'c' copied from 'b'! |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
304 $ hg log --template '{rev} {parents} {desc}\n' -r tip |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
305 14 1:5d205f8b35b6 3 |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
306 (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
307 |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
308 Resolve conflicted graft |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
309 $ hg up -q 0 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
310 $ echo b > a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
311 $ hg ci -m 8 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
312 created new head |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
313 $ echo a > a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
314 $ hg ci -m 9 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
315 $ hg graft 1 --tool internal:fail |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
316 grafting revision 1 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
317 abort: unresolved conflicts, can't continue |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
318 (use hg resolve and hg graft --continue) |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
319 [255] |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
320 $ hg resolve --all |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
321 merging a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
322 $ hg graft -c |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
323 grafting revision 1 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
324 $ hg export tip --git |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
325 # HG changeset patch |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
326 # User bar |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
327 # Date 0 0 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
18631
diff
changeset
|
328 # Thu Jan 01 00:00:00 1970 +0000 |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
329 # Node ID 64ecd9071ce83c6e62f538d8ce7709d53f32ebf7 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
330 # Parent 4bdb9a9d0b84ffee1d30f0dfc7744cade17aa19c |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
331 1 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
332 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
333 diff --git a/a b/a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
334 --- a/a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
335 +++ b/a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
336 @@ -1,1 +1,1 @@ |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
337 -a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
338 +b |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
339 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
340 Resolve conflicted graft with rename |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
341 $ echo c > a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
342 $ hg ci -m 10 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
343 $ hg graft 2 --tool internal:fail |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
344 grafting revision 2 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
345 abort: unresolved conflicts, can't continue |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
346 (use hg resolve and hg graft --continue) |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
347 [255] |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
348 $ hg resolve --all |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
349 merging a and b to b |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
350 $ hg graft -c |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
351 grafting revision 2 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
352 $ hg export tip --git |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
353 # HG changeset patch |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
354 # User test |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
355 # Date 0 0 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
18631
diff
changeset
|
356 # Thu Jan 01 00:00:00 1970 +0000 |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
357 # Node ID 2e80e1351d6ed50302fe1e05f8bd1d4d412b6e11 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
358 # Parent e5a51ae854a8bbaaf25cc5c6a57ff46042dadbb4 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
359 2 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
360 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
361 diff --git a/a b/b |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
362 rename from a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
363 rename to b |
17185
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
364 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
365 Test simple origin(), with and without args |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
366 $ hg log -r 'origin()' |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
367 changeset: 1:5d205f8b35b6 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
368 user: bar |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
369 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
370 summary: 1 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
371 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
372 changeset: 2:5c095ad7e90f |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
373 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
374 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
375 summary: 2 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
376 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
377 changeset: 3:4c60f11aa304 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
378 user: baz |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
379 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
380 summary: 3 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
381 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
382 changeset: 4:9c233e8e184d |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
383 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
384 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
385 summary: 4 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
386 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
387 changeset: 5:97f8bfe72746 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
388 branch: stable |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
389 parent: 3:4c60f11aa304 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
390 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
391 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
392 summary: 5 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
393 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
394 $ hg log -r 'origin(7)' |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
395 changeset: 2:5c095ad7e90f |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
396 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
397 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
398 summary: 2 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
399 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
400 Now transplant a graft to test following through copies |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
401 $ hg up -q 0 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
402 $ hg branch -q dev |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
403 $ hg ci -qm "dev branch" |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
404 $ hg --config extensions.transplant= transplant -q 7 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
405 $ hg log -r 'origin(.)' |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
406 changeset: 2:5c095ad7e90f |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
407 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
408 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
409 summary: 2 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
410 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
411 Test simple destination |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
412 $ hg log -r 'destination()' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
413 changeset: 7:ef0ef43d49e7 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
414 parent: 0:68795b066622 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
415 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
416 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
417 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
418 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
419 changeset: 8:6b9e5368ca4e |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
420 user: bar |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
421 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
422 summary: 1 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
423 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
424 changeset: 9:1905859650ec |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
425 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
426 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
427 summary: 5 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
428 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
429 changeset: 10:52dc0b4c6907 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
430 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
431 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
432 summary: 4 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
433 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
434 changeset: 11:882b35362a6b |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
435 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
436 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
437 summary: 3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
438 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
439 changeset: 13:9db0f28fd374 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
440 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
441 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
442 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
443 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
444 changeset: 14:f64defefacee |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
445 parent: 1:5d205f8b35b6 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
446 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
447 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
448 summary: 3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
449 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
450 changeset: 17:64ecd9071ce8 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
451 user: bar |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
452 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
453 summary: 1 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
454 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
455 changeset: 19:2e80e1351d6e |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
456 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
457 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
458 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
459 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
460 changeset: 21:7e61b508e709 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
461 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
462 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
463 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
464 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
465 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
466 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
467 $ hg log -r 'destination(2)' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
468 changeset: 7:ef0ef43d49e7 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
469 parent: 0:68795b066622 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
470 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
471 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
472 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
473 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
474 changeset: 13:9db0f28fd374 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
475 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
476 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
477 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
478 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
479 changeset: 19:2e80e1351d6e |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
480 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
481 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
482 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
483 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
484 changeset: 21:7e61b508e709 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
485 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
486 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
487 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
488 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
489 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
490 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
491 Transplants of grafts can find a destination... |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
492 $ hg log -r 'destination(7)' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
493 changeset: 21:7e61b508e709 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
494 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
495 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
496 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
497 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
498 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
499 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
500 ... grafts of grafts unfortunately can't |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
501 $ hg graft -q 13 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
502 $ hg log -r 'destination(13)' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
503 All copies of a cset |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
504 $ hg log -r 'origin(13) or destination(origin(13))' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
505 changeset: 2:5c095ad7e90f |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
506 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
507 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
508 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
509 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
510 changeset: 7:ef0ef43d49e7 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
511 parent: 0:68795b066622 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
512 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
513 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
514 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
515 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
516 changeset: 13:9db0f28fd374 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
517 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
518 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
519 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
520 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
521 changeset: 19:2e80e1351d6e |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
522 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
523 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
524 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
525 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
526 changeset: 21:7e61b508e709 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
527 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
528 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
529 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
530 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
531 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
532 changeset: 22:1313d0a825e2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
533 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
534 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
535 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
536 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
537 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
538 |