Mercurial > hg

comparison tests/test-merge-subrepos.t @ 40404:956ec6f1320d stable 4.8rc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge to stable for 4.8 release freeze
author Augie Fackler <augie@google.com>
date Mon, 22 Oct 2018 14:46:06 -0400
parents a3fd84f4fb38
children 1de3364320af
comparison
equal deleted inserted replaced
40131:535fc8a22365 40404:956ec6f1320d
108 [255] 108 [255]
109 109
110 $ hg up -r '.^' --config ui.interactive=True << EOF 110 $ hg up -r '.^' --config ui.interactive=True << EOF
111 > d 111 > d
112 > EOF 112 > EOF
113 other [destination] changed b which local [working copy] deleted 113 file 'b' was deleted in local [working copy] but was modified in other [destination].
114 What do you want to do?
114 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d 115 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
115 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
116 117
117 XXX: There's a difference between wdir() and '.', so there should be a status. 118 XXX: There's a difference between wdir() and '.', so there should be a status.
118 `hg files -S` from the top is also missing 'subrepo/b'. 119 `hg files -S` from the top is also missing 'subrepo/b'.