nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Merge two Branches and version history

System

We have two Branches that are starting to share the same content (attachements) and it would be easier to merge the two Branches. I am looking to have all the version history of both Branches together in one.

I though about creating a new Branch and doing a copyTo but the old version history is still on the other two Branches and deleting those two after creating the new one would delete all the history.

Can a merge of two Branches be done?

Find more posts tagged with

Comments

reddyl

you can create a script that will fetch the older version of the file from each branch to the newly created branch/workarea and then submit it to migrate the history.

Migrateduser

But wouldn't that put the current date in the version history for each submitted version. In other words, if I have a file that has 7 versions and I make a script that submits each version I would probably see the same date on each version in the new branch.

reddyl

You are right I did not realize it, I dont know if there is way to change the submit event details to specify a later date.

Adam Stoller

But wouldn't that put the current date in the version history for each submitted version. In other words, if I have a file that has 7 versions and I make a script that submits each version I would probably see the same date on each version in the new branch.

If you really wanted to try to hack this - you could have a script that:

(a) retrieves each version of the file from original_branch_1
(b) determines the date/time of that version
(c) resets the system date/time on the server to that date/time
(d) potentially assumes the identity of the user who submitted that version
(e) copies the file into the target branch and submits it using the retrieved comment
(f) repeat for each file in each directory of each branch that you want to migrate

Even this is not guaranteed to work - and it would probably require some amount of server downtime to re-set the system time (perhaps turning off automated processes that try to sync the system time with a time-server) and you could potentially mess up the backing store (you wouldn't want *anyone else* to be doing *anything else* on that server while you were doing this - and you'd want to make sure you have a good backup of the backing store first too).

Just a though (while running a time consuming process on my current project)

Migrateduser

Interesting idea, but too much work involved for the benefit. I think I'll just move it over to the other branch, then make sure the users don't use the other branch for submitting dcr's (change file permissions or workarea ownership or something like that. Then if a version needs to be retrieved that was prior to the "branch merge" it would come from the old branch. Anything after the "branch merge" would come from the merged branch. Maybe a year from now I can delete the old branch and it's version history (tape backup will be an option if they "really" need an old version).

*Sigh*, looks like what I want isn't going to be possible. You can't have it all.