Mercurial > hg
view tests/test-merge-prompt.out @ 6297:fed1a9c22076
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | 8a5d8fb59ed2 |
children | 4b0c9c674707 |
line wrap: on
line source
adding file1 adding file2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved # non-interactive merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) status: M file2 C file1 file1: 1 changed file2: 2 changed # interactive merge 0 files updated, 0 files merged, 1 files removed, 0 files unresolved local changed file1 which remote deleted use (c)hanged version or (d)elete? remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) status: file2: No such file or directory C file1 file1: 1 changed file2 does not exist # interactive merge with bad input 0 files updated, 0 files merged, 0 files removed, 0 files unresolved local changed file1 which remote deleted use (c)hanged version or (d)elete? unrecognized response local changed file1 which remote deleted use (c)hanged version or (d)elete? unrecognized response local changed file1 which remote deleted use (c)hanged version or (d)elete? remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? unrecognized response remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) status: M file2 R file1 file1 does not exist file2: 2 changed # interactive merge with not enough input 1 files updated, 0 files merged, 1 files removed, 0 files unresolved local changed file1 which remote deleted use (c)hanged version or (d)elete? remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? abort: response expected failed status: file2: No such file or directory C file1 file1: 1 changed file2 does not exist