[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Can't synchronize branch with trunk

From: Kiren Pillay <kirenpillay1_at_gmail.com>
Date: Fri, 1 Mar 2013 18:12:52 +0200

Hi

I've encountered a strange problem, hopefully someone can help me here.
Below is a diagram of our repo

----->trunk------mod ABC-------------------------+
         + |
         | |
       branch-copy WPB-------Mods XYZ---+

1. From trunk we created a copy to a new dev branch for workpackage-B.
2. Commits XYZ where made to branch WPB
3. In parallel, mods ABC where made to trunk
4. When trying to bring changes into WPB via merge, none of the changes are
seen. They are basically ignored.

I've tried cherry picking as well, but this synchronization merge isn't
working. What could be wrong here?

This is the output from my eclipse IDE, the same happens from the
commandline:
Operation Resource Path
---------
-------------------------------------------------------------------
Modified /home/kiren/Documents/workspace-QA/V2.1.0-work-package-B
merge completed /home/kiren/Documents/workspace-QA/V2.1.0-work-package-B

Regards
Kiren Pillay
Received on 2013-03-01 17:13:28 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.