Mercurial > hg

comparison tests/test-mq-subrepo.t @ 24837:edf907bd8144 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
record: fix record with change on moved file crashes (issue4619) reverting 79fceed67676, add a test to prevent the issue from coming back.
author Laurent Charignon <lcharignon@fb.com>
date Wed, 22 Apr 2015 13:56:30 -0700
parents b39afa36006a
children 8133494accf1
comparison
equal deleted inserted replaced
24836:1f9127c9239b 24837:edf907bd8144
293 % qrecord --config ui.interactive=1 -m0 0.diff 293 % qrecord --config ui.interactive=1 -m0 0.diff
294 diff --git a/.hgsub b/.hgsub 294 diff --git a/.hgsub b/.hgsub
295 new file mode 100644 295 new file mode 100644
296 examine changes to '.hgsub'? [Ynesfdaq?] y 296 examine changes to '.hgsub'? [Ynesfdaq?] y
297 297
298 @@ -0,0 +1,1 @@
299 +sub = sub
300 record this change to '.hgsub'? [Ynesfdaq?] y
301
302 warning: subrepo spec file '.hgsub' not found
303 abort: uncommitted changes in subrepository 'sub' 298 abort: uncommitted changes in subrepository 'sub'
304 [255] 299 [255]
305 % update substate when adding .hgsub w/clean updated subrepo 300 % update substate when adding .hgsub w/clean updated subrepo
306 A .hgsub 301 A .hgsub
307 % qrecord --config ui.interactive=1 -m0 0.diff 302 % qrecord --config ui.interactive=1 -m0 0.diff
308 diff --git a/.hgsub b/.hgsub 303 diff --git a/.hgsub b/.hgsub
309 new file mode 100644 304 new file mode 100644
310 examine changes to '.hgsub'? [Ynesfdaq?] y 305 examine changes to '.hgsub'? [Ynesfdaq?] y
311 306
312 @@ -0,0 +1,1 @@
313 +sub = sub
314 record this change to '.hgsub'? [Ynesfdaq?] y
315
316 warning: subrepo spec file '.hgsub' not found
317 path sub 307 path sub
318 source sub 308 source sub
319 revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 309 revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
320 $ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF 310 $ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF
321 > y 311 > y