Mercurial > hg
view tests/test-update-reverse @ 10672:c2e1e637d4da stable
rebase: always check if rebasing onto an applied mq patch.
Previously, it only checked for an mq patch if the user explicitly
passed -d/--dest. But rebasing onto an mq patch is a bad idea
regardless of how we determine the rebase destination.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Tue, 02 Mar 2010 15:08:43 -0500 |
parents | 7544700fd931 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg commit -m "Added a" -d "1000000 0" touch main hg add main hg commit -m "Added main" -d "1000000 0" hg checkout 0 echo Main should be gone ls touch side1 hg add side1 hg commit -m "Added side1" -d "1000000 0" touch side2 hg add side2 hg commit -m "Added side2" -d "1000000 0" hg log echo Should have two heads, side2 and main hg heads echo Should show "a side1 side2" ls hg update --debug -C 1 echo Should only show "a main" ls