So..it turned out that no files were added.. The main trunk doesn't seem to
detect the changes in its branch..
$cd trunk
$bzr merge ../new-feature-branch
$bzr st <it couldn't sense addition of files in the new-feature-branch
directory>
Any
suggestions to solve it would be great :). If not, I'll do it manually
by copy&paste into the main trunk next time. The files were just
duplications of Law2_Dem3Dof_Elastic_Elastic in meta style.
Yours,
CWBoon
> To: [email protected]
> From: [email protected]
> Date: Mon, 7 Dec 2009 22:15:20 +0000
> Subject: [Yade-dev] [Branch ~yade-dev/yade/trunk] Rev 1866: Removed
> BasicPM.cpp and added CundallStrack.cpp. It is a duplication of
> Law2_Dem3Dof_Elastic_Elas...
>
> Merge authors:
> booncw (booncw)
> ------------------------------------------------------------
> revno: 1866 [merge]
> committer: CWBoon <[email protected]>
> branch nick: trunk
> timestamp: Mon 2009-12-07 17:12:24 -0500
> message:
> Removed BasicPM.cpp and added CundallStrack.cpp. It is a duplication of
> Law2_Dem3Dof_Elastic_Elastic but written in meta style like RockPM. It is
> therefore cleaner and more friendly to a beginner.
> removed:
> pkg/dem/meta/BasicPM.cpp
> pkg/dem/meta/BasicPM.hpp
> pkg/dem/meta/BasicPMTest.py
>
>
> --
> lp:yade
> https://code.launchpad.net/~yade-dev/yade/trunk
>
> Your team Yade developers is subscribed to branch lp:yade.
> To unsubscribe from this branch go to
> https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.
_________________________________________________________________
Windows 7: Find the right PC for you. Learn more.
http://windows.microsoft.com/shop_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
