bug: cannot rename files with MQ

Armando Singer armando.singer at gmail.com
Fri Nov 3 13:38:33 CST 2006


Thanks for adding it to the bug tracker. There is a workaround (loses
rename info, though). It is below if anyone is interested. I
evangelized and rolled out the use of MQ to our company. Luckily, we
don't have to stop using it. To do the same thing with the workaround:

$ hg init foo && cd foo
$ hg qnew -m "test" test
$  echo "foo" > foo && hg add
adding foo
$ mv foo bar  # just use regular mv
$ hg addremove # tell hg about it
adding bar
removing foo
$ hg qrefresh
$ cat .hg/patches/test
test

diff --git a/bar b/bar
new file mode 100644
--- /dev/null
+++ b/bar
@@ -0,0 +1,1 @@
+foo
$ hg qpop
Patch queue now empty
$ hg qpush
applying test
Now at: test

Thanks again,
Armando

On 11/3/06, Benoit Boissinot <bboissin at gmail.com> wrote:
> On 11/3/06, Armando Singer <armando.singer at gmail.com> wrote:
>
> added in the bug tracker: http://www.selenic.com/mercurial/bts/issue414
>
> > Ok, another one resulting resulting in a corrupt repository. A
> > colleague hg renamed a bunch of files on qtop. This patch was qpopped
> > to rebase. qpushing then fails and leaves broken patches and local
> > unmodified changes.
>


More information about the Mercurial mailing list