tests/test-commit-unresolved.t
author Matt Harbison <matt_harbison@yahoo.com>
Wed, 12 Sep 2018 23:10:59 -0400
changeset 39593 c8514f858788
parent 35704 41ef02ba329b
child 42600 3bc400ccbf99
permissions -rw-r--r--
tests: stabilize change for handling not quoting non-empty-directory The change originated in cb1329738d64. I suspect the problem is with the combination of (re) and the '\' to '/' retry on Windows. I've no idea if py3 on Windows needs the quoting, since it can't even run `hg` with no arguments. (It's dying somewhere on the ctype declarations when win32.py is imported.)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     1
  $ addcommit () {
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     2
  >     echo $1 > $1
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     3
  >     hg add $1
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     4
  >     hg commit -d "${2} 0" -m $1
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     5
  > }
6888
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
     6
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     7
  $ commit () {
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     8
  >     hg commit -d "${2} 0" -m $1
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
     9
  > }
6910
93609576244e Debashify rebase tests
Brendan Cully <brendan@kublai.com>
parents: 6888
diff changeset
    10
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    11
  $ hg init a
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    12
  $ cd a
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    13
  $ addcommit "A" 0
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    14
  $ addcommit "B" 1
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    15
  $ echo "C" >> A
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    16
  $ commit "C" 2
6888
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
    17
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    18
  $ hg update -C 0
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    19
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    20
  $ echo "D" >> A
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    21
  $ commit "D" 3
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    22
  created new head
6888
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
    23
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    24
State before the merge
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    25
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    26
  $ hg status
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    27
  $ hg id
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    28
  e45016d2b3d3 tip
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    29
  $ hg summary
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    30
  parent: 3:e45016d2b3d3 tip
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    31
   D
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    32
  branch: default
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    33
  commit: (clean)
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    34
  update: 2 new changesets, 2 branch heads (merge)
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    35
  phases: 4 draft
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    36
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    37
Testing the abort functionality first in case of conflicts
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    38
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    39
  $ hg merge --abort
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    40
  abort: no merge in progress
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    41
  [255]
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    42
  $ hg merge
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    43
  merging A
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    44
  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    45
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    46
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    47
  [1]
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    48
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    49
  $ hg merge --abort e4501
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    50
  abort: cannot specify a node with --abort
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    51
  [255]
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    52
  $ hg merge --abort --rev e4501
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    53
  abort: cannot specify both --rev and --abort
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    54
  [255]
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    55
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    56
  $ hg merge --abort
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    57
  aborting the merge, updating back to e45016d2b3d3
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    58
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    59
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    60
Checking that we got back in the same state
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    61
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    62
  $ hg status
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    63
  ? A.orig
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    64
  $ hg id
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    65
  e45016d2b3d3 tip
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    66
  $ hg summary
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    67
  parent: 3:e45016d2b3d3 tip
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    68
   D
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    69
  branch: default
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    70
  commit: 1 unknown (clean)
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    71
  update: 2 new changesets, 2 branch heads (merge)
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    72
  phases: 4 draft
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    73
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    74
Merging a conflict araises
6888
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
    75
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    76
  $ hg merge
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    77
  merging A
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 23917
diff changeset
    78
  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    79
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
    80
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
    81
  [1]
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    82
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    83
Correct the conflict without marking the file as resolved
6888
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
    84
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    85
  $ echo "ABCD" > A
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    86
  $ hg commit -m "Merged"
29975
c15f06109b7a localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 27102
diff changeset
    87
  abort: unresolved merge conflicts (see 'hg help resolve')
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
    88
  [255]
6888
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
    89
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    90
Mark the conflict as resolved and commit
6888
7c36a4fb05a3 make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset
    91
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    92
  $ hg resolve -m A
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21267
diff changeset
    93
  (no more unresolved files)
11804
6c24465613de tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8168
diff changeset
    94
  $ hg commit -m "Merged"
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15501
diff changeset
    95
27102
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
    96
Test that if a file is removed but not marked resolved, the commit still fails
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
    97
(issue4972)
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
    98
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
    99
  $ hg up ".^"
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   100
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   101
  $ hg merge 2
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   102
  merging A
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   103
  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   104
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   105
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
27102
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   106
  [1]
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   107
  $ hg rm --force A
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   108
  $ hg commit -m merged
29975
c15f06109b7a localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 27102
diff changeset
   109
  abort: unresolved merge conflicts (see 'hg help resolve')
27102
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   110
  [255]
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   111
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   112
  $ hg resolve -ma
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   113
  (no more unresolved files)
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   114
  $ hg commit -m merged
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   115
  created new head
f97bb61b51e6 localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   116
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   117
Testing the abort functionality in case of no conflicts
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   118
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   119
  $ hg update -C 0
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   120
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   121
  $ addcommit "E" 4
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   122
  created new head
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   123
  $ hg id
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   124
  68352a18a7c4 tip
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   125
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   126
  $ hg merge -r 4
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   127
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   128
  (branch merge, don't forget to commit)
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   129
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   130
  $ hg merge --preview --abort
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   131
  abort: cannot specify --preview with --abort
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   132
  [255]
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   133
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   134
  $ hg merge --abort
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   135
  aborting the merge, updating back to 68352a18a7c4
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   136
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   137
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   138
  $ hg id
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   139
  68352a18a7c4 tip
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 29975
diff changeset
   140
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15501
diff changeset
   141
  $ cd ..