Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-dir-merge @ 4555:1843d31bfdbf
localrepo: don't search from path
All current callers already pass in the repo root.
This normalizes things a bit. Now all repo types take a direct path to
repo root and only the command line interface (or the dispatcher)
searches from the current directory.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 11 Jun 2007 21:09:24 -0500 |
parents | 7b88bd88f040 |
children | dee573ba79f1 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init mkdir a echo foo > a/a echo bar > a/b hg add a hg ci -m "0" -d "0 0" hg co -C 0 hg mv a b hg ci -m "1 mv a/ b/" -d "0 0" hg co -C 0 echo baz > a/c hg add a/c hg ci -m "2 add a/c" -d "0 0" hg merge --debug 1 echo a/* b/* hg st -C hg ci -m "3 merge 2+1" -d "0 0" hg co -C 1 hg merge --debug 2 echo a/* b/* hg st -C hg ci -m "4 merge 1+2" -d "0 0"