Mercurial > hg
view tests/test-merge-prompt.out @ 8548:3ccbe42ff72f
setup: read .hg_archival.txt for version info (issue1670)
Previously, setup.py was enhanced to identify the Mercurial version
from either .hg/ or mercurial/__version__.py. When archives are
created using 'hg archive' or via hgweb, neither of those options are
available. However, there is a .hg_archival.txt file in the root of
the archive that has the information. This patch enhances setup.py to
identify the Mercurial version from the .hg_archival.txt file when
there is no .hg/ or mercurial/__version__.py available.
author | Jeremy Whitlock <jcscoobyrs@gmail.com> |
---|---|
date | Fri, 22 May 2009 21:03:06 +0200 |
parents | 4b0c9c674707 |
children | 01ada7b1861d |
line wrap: on
line source
adding file1 adding file2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head # 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