Dean Malmgren deanmalmgren
deanmalmgren
/ gist:1790480
Created
February 10, 2012 16:01
merge work from mercurial repository ./X/path/to/dir into repository ./Y/path/to/dir
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # from the bash prompt... | |
| # starting from the directory that contains repositories X and Y, use 'hg convert --filemap' to find | |
| # extract the content from path/to/dir in repository X and put it into a temporary repository TMP | |
| echo 'include "path/to/dir"' > filemap.txt | |
| hg convert --filemap.txt ./X ./TMP | |
| # enter repository Y and do a "force pull" to pull in the changes from the temporary repository TMP | |
| cd ./Y | |
| hg pull -f ../TMP |
NewerOlder