comparison tests/test-mq-merge.t @ 12375:02990e22150b

tests: require regexes in unified tests to be marked with " (re)"

Consider this test:

  $ hg glog --template '{rev}:{node|short} "{desc}"\n'
  @  2:20c4f79fd7ac "3"
  |
  | o  1:38f24201dcab "2"
  |/
  o  0:2a18120dc1c9 "1"

Because each line beginning with "|" can be compiled as a regular
expression (equivalent to ".*|"), they will match any output.

Similarly:

  $ echo foo


The blank output line can be compiled as a regular expression and will
also match any output.

With this patch, none of the above output lines will be matched as
regular expressions. A line must end in " (re)" in order to be matched
as one.

Lines are still matched literally first, so the following will pass:

  $ echo 'foo (re)'
  foo (re)

12374:4e7dd28db0dd

  $ hg qrefresh -m "rm a"

Save the patch queue so we can merge it later:

  $ hg qsave -c -e
  copy .*/t/\.hg/patches to .*/t/\.hg/patches\.1
  $ checkundo

Update b and commit in an "update" changeset:

  $ hg up -C init

  $ hg manifest
  a
  b

  $ hg qpush -a -m
  merging with queue at: .*/t/\.hg/patches\.1
  applying rm_a
  now at: rm_a

  $ checkundo
  $ hg manifest

  $ hg qnew -d '0 0' -f -e patcha2

Create the reference queue:

  $ hg qsave -c -e -n refqueue
  copy .*/t2/\.hg/patches to .*/t2/\.hg/refqueue
  $ hg up -C 1
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

Merge:

  $ HGMERGE=internal:other hg qpush -a -m -n refqueue
  merging with queue at: .*/t2/\.hg/refqueue
  applying patcha
  patching file a
  Hunk #1 FAILED at 0
  1 out of 1 hunks FAILED -- saving rejects to file a.rej
  patch failed, unable to continue (try -v)

Check patcha2 is still a regular patch:

  $ cat .hg/patches/patcha2
  # HG changeset patch
  # Parent ........................................
  # Date 0 0
  
  diff -r ............ -r ............ a
  --- a/a
  +++ b/a
  @@ -1,2 +1,3 @@
   a
   c

12375:02990e22150b

  $ hg qrefresh -m "rm a"

Save the patch queue so we can merge it later:

  $ hg qsave -c -e
  copy .*/t/\.hg/patches to .*/t/\.hg/patches\.1 (re)
  $ checkundo

Update b and commit in an "update" changeset:

  $ hg up -C init

  $ hg manifest
  a
  b

  $ hg qpush -a -m
  merging with queue at: .*/t/\.hg/patches\.1 (re)
  applying rm_a
  now at: rm_a

  $ checkundo
  $ hg manifest

  $ hg qnew -d '0 0' -f -e patcha2

Create the reference queue:

  $ hg qsave -c -e -n refqueue
  copy .*/t2/\.hg/patches to .*/t2/\.hg/refqueue (re)
  $ hg up -C 1
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

Merge:

  $ HGMERGE=internal:other hg qpush -a -m -n refqueue
  merging with queue at: .*/t2/\.hg/refqueue (re)
  applying patcha
  patching file a
  Hunk #1 FAILED at 0
  1 out of 1 hunks FAILED -- saving rejects to file a.rej
  patch failed, unable to continue (try -v)

Check patcha2 is still a regular patch:

  $ cat .hg/patches/patcha2
  # HG changeset patch
  # Parent ........................................ (re)
  # Date 0 0
  
  diff -r ............ -r ............ a (re)
  --- a/a
  +++ b/a
  @@ -1,2 +1,3 @@
   a
   c