Hi all, I'm a little bit confused about the internal handling of rebase. I will explain it by an example.
One has made serveral changesets to a file 'source_a' in directory "dir_a" so one has reached rev 20. Than one updates back to revision 1 in the repository. There the directory "dir_a" is renamed (via tortoisehg) to 'dir_b' and committed so one has a revision 21 in a new branch. Now one tries to do a rebase by "hg rebase -s 21 -d 1". With this one has to do serveral "merges" to 'source_a'. So why dose mercurial have to do merges to a file whose names was just moved arround ?! Best regards ------------------------------------------------------------------------------ ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
