tests/test-merge4.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Tue, 29 Sep 2015 01:03:26 -0700
changeset 26641 5c57d01fe64e
parent 16536 63c817ea4a70
child 44343 8561ad49915d
permissions -rw-r--r--
destupdate: also include bookmark related logic For the same reason, we move the bookmark related update logic into the 'destupdate' function. This requires to extend the returns of the function to include the bookmark that needs to move (more or less) and the bookmark to activate at the end of the function. See function documentation for details on this returns.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11977
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
     1
  $ hg init
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
     2
  $ echo This is file a1 > a
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
     3
  $ hg add a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11977
diff changeset
     4
  $ hg commit -m "commit #0"
11977
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
     5
  $ echo This is file b1 > b
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
     6
  $ hg add b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11977
diff changeset
     7
  $ hg commit -m "commit #1"
11977
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
     8
  $ hg update 0
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
     9
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
    10
  $ echo This is file c1 > c
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
    11
  $ hg add c
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11977
diff changeset
    12
  $ hg commit -m "commit #2"
11977
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
    13
  created new head
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
    14
  $ hg merge 1
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
    15
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
    16
  (branch merge, don't forget to commit)
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
    17
  $ rm b
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
    18
  $ echo This is file c22 > c
16536
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
    19
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
    20
Test hg behaves when committing with a missing file added by a merge
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
    21
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11977
diff changeset
    22
  $ hg commit -m "commit #3"
16536
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
    23
  abort: cannot commit merge with missing files
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
    24
  [255]
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
    25