Mercurial > hg

comparison tests/test-rename-merge1.t @ 16793:9cbc44a6600e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: do not create repos inside repos in test-rename-merge1.t This is no actual problem, but I when adding more tests to this file, the directory structure would become t/repo2089/repoXXXX/repoYYYY/...
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 23 May 2012 17:33:19 +0200
parents ad394c897b16
children 98687cdddcb1
comparison
equal deleted inserted replaced
16792:ad394c897b16 16793:9cbc44a6600e
121 (branch merge, don't forget to commit) 121 (branch merge, don't forget to commit)
122 122
123 $ cat f2 123 $ cat f2
124 c0 124 c0
125 125
126 $ cd ..
127
126 Check for issue2089 128 Check for issue2089
127 129
128 $ hg init repo2089 130 $ hg init repo2089
129 $ cd repo2089 131 $ cd repo2089
130 132
150 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 152 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
151 (branch merge, don't forget to commit) 153 (branch merge, don't forget to commit)
152 154
153 $ cat f2 155 $ cat f2
154 c2 156 c2
157
158 $ cd ..