1

I am working on a project that is set up with each group having a server-side clone of our main mercurial repository. The workflow we have been using involves developing on laptops, committing and pushing to the server-side clone repositories and then pulling those changes to a powerful remote machine to run our tests. Once the changes are ready to be shared with the rest of the group, the main server-side clone is pulled and into the local repository and the local repository is rebased against the main clone. The changes can then be pushed to the main remote clone and the history will show a linear history.

The problem is then that the personal server-side clone is totally out of sync with the local repository because it was not rebased. We aren't using proper branches, so merge+rebase and transplant/graft seem to not be what we would use to get the repositories back in sync.

The server-side clone needs to have the same history as the the local repository or it will pull and push ALL of the change sets and be a time consuming mess of resolving non-existent conflicts. How would one get the server-side clone to have the same history as the main and local repositories without stripping and pulling from main? Ideally, we would not have to log into the server.

oberfreak
  • 1,799
  • 13
  • 20
weitzner
  • 440
  • 3
  • 12

2 Answers2

2

You can only pull from the 'main' repo to get its history, but this won't delete the not-rebased history from your dev server and local repos.

The only way to have only 'main' history is stripping other repos (or even re-cloning them), and this must be done simultaneously for all repos.

P.s. And don't rebase. It's for private repos only.

Pavel Gatilov
  • 7,579
  • 1
  • 27
  • 42
  • Thanks. I think we were hoping for rebasing to magically allow us to use DVC and have a linear history. We stopped rebasing and now it works and shows a very wide history. – weitzner Dec 06 '11 at 20:47
0

Rebasing is deterministic, so you could re-do the rebase in the client clones.

The only cause for concern is if the rebase triggered a merge resolution — in that case you'll have to resolve the merge the same way in the client. Doing that without peeking at the code on the server could be difficult.

Martin Geisler
  • 72,968
  • 25
  • 171
  • 229