Merging unrelated repositories
Malcolm Matalka
mmatalka at gmail.com
Wed Jan 26 12:22:42 UTC 2022
Chris Green <cl at isbd.net> writes:
> On Tue, Jan 25, 2022 at 09:39:03PM +0000, Chris Green wrote:
> [snip]
>>
>> I've just tried it on a copy and it does seem to work OK, can someone
>> just expand/explain a little please.
>>
> Except that it doesn't work, every other directory in my repository
> seems to have dispappeared! Fortunately it's a copy so it doesn't
> matter but I really don't understand what it's done.
>
> In my original (unchanged) main repository I can see:-
>
> chris at esprimo$ cd .cfg
> /home/chris/.cfg
> chris at esprimo$ ls share
> archive mpv temperature
> chris at esprimo$ ls lib
> python
> ris at esprimo$ ls hosts
> backup bison dns esprimo isbd odin t470 x201
>
>
> In the copy, after the merge, I see:-
>
> chris at esprimo$ cd ~/tmp/cfg
> /home/chris/tmp/cfg
> chris at esprimo$ ls share
> temperature
> chris at esprimo$ ls lib
> python
> chris at esprimo$ ls hosts
> bison dns esprimo t470
>
>
> So what on earth went wrong?
Was there any output in the pull -f? Also have you looked at available
branches and/or bookmarks? When I have done this in the past, it does
not merge them until you do, in which case you have two repos living
together and you need to merge them together by hand. It's not clear if
that's what you're actually doing in this example.
More information about the Mercurial
mailing list