On 5/31/2017 10:57 AM, Ron W wrote:
On Tue, May 30, 2017 at 8:00 AM,
<fossil-users-requ...@lists.fossil-scm.org
<mailto:fossil-users-requ...@lists.fossil-scm.org>> wrote:

    Date: Mon, 29 May 2017 22:35:31 -0500
    From: The Tick <the.t...@gmx.com <mailto:the.t...@gmx.com>>
    Subject: Re: [fossil-users] Is it possible to merge repository's?

    On 5/29/2017 10:30 PM, Andy Bradford wrote:
    > Thus said Stephan Beal on Tue, 30 May 2017 02:57:38 +0200:
    >
    >> However, there is  _hypothetically_ a way to completely  merge 2
    repos
    >> into one while keeping all commits, but i'm not at all certain if
    this
    >> would work...
    >
    > I think it actually will work for some definition of ``work''.
    I've done
    > it before.
    >
    > But... it depends on what one expects out of it.
    >
    > There will  be 2 separate  and independent timelines  once
    reconstructed
    > and there  will not be a  relationship between artifacts except
    for the
    > fact that they all live in the same Fossil file.
    >

     From this I gather that there would be no way to connect the imported
    repository onto the main trunk. That was not what I was hoping for.


What is your objective?

Once you have both time lines in one repository, you can then fetch
files from both into a single checkout and start making checkins  that
affect both timelines, therefore, effectively merging the timelines at
that checkin.

To get the "combined" checkout, I think you would have to "fossil
checkout uuidLatestA", then make a trivial change to all the files, then
"fossil update uuidLatestB".

At this point a commit would affect both timelines.

Though, as Stephan mentioned, you might need to do a reparent command to
insure that both uuidLatestA and uuidLatestB are parents of this new commit.


Thanks for the suggestions.

The reason I had is because I started a subproject and, after a couple weeks, realized that it would be more convenient to have its repository merged into my main project as a sub-directory. I thought this might be an existing feature somehow.

As I have just begun using fossil in the past month or so, the suggestions here are pretty much over my head and I don't feel comfortable enough with fossil to begin experimenting at this depth.


_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to