|
From: | Mando Rodriguez |
Subject: | [Monotone-devel] merge conflicts |
Date: | Wed, 02 Dec 2009 15:33:05 -0600 |
User-agent: | Thunderbird 2.0.0.23 (Macintosh/20090812) |
Hello all,Is it possible to pull revisions that are only merges and have conflicts on one of the repositories? Here is the scenario:
user 1: using monotone 0.44 on mac OSX user 2: using monotone 0.45 on Ubuntu lenny sidrepository server: serving monotone repositories with version 0.45 on Debian 5.0.3 test user: is on the same machine as the repository server as a separate user, monotone version 0.45
The test user routinely pulls from the repository server process to get the latest updates, does a build and test of the system and sends out an error report via email. The test user recently had some merge conflicts which halted this process, content wise the repositories for user 1, 2 and the test user are the same, however there was 3 extra revisions on the test users repository which all appear to be merges from the automated update (a fourth revision was a manual merge to resolve the conflict). It apparently tried to perform the same merge a couple of times too, which appeared really odd.
Syncs and updates for user 1 and 2 were just fine. Are these merge revisions a bug of some sort, just not sure why they would cause a conflict for that test user.
Thanks, Mando
[Prev in Thread] | Current Thread | [Next in Thread] |