Hi Edward,
there is one conflict I could not find how to solve it. It is concerning
about the file 'graphics/wizards/value/value.png', which you can also see
in
following output.
Best,
Han
C graphics/wizards/value/value.png
C graphics/oxygen_icons/22x22/actions/document-close.png
> local add, incoming add upon merge
C graphics/oxygen_icons/22x22/actions/document-new.png
> local add, incoming add upon merge
C graphics/oxygen_icons/22x22/actions/document-open-folder.png
> local add, incoming add upon merge
C graphics/oxygen_icons/48x48/actions/document-close.png
> local add, incoming add upon merge
C graphics/oxygen_icons/48x48/actions/document-new.png
> local add, incoming add upon merge
C graphics/oxygen_icons/48x48/actions/document-open-folder.png
> local add, incoming add upon merge
C graphics/oxygen_icons/32x32/actions/document-close.png
> local add, incoming add upon merge
C graphics/oxygen_icons/32x32/actions/document-new.png
> local add, incoming add upon merge
C graphics/oxygen_icons/32x32/actions/document-open-folder.png
> local add, incoming add upon merge
C graphics/oxygen_icons/16x16/actions/document-close.png
> local add, incoming add upon merge
C graphics/oxygen_icons/16x16/actions/document-open-folder.png
> local add, incoming add upon merge
A + relax.py
C extern
> local add, incoming add upon merge
On Aug 2, 2011, at 10:00 AM, Edward d'Auvergne wrote:
Hi,
Try to perform the 'svnmerge.py merge' update process and see what
happens. Before committing the update, check with 'svn st' that there
is no conflicts on '.' as that would be hard to fix and prevent me
from merging the branch back into the 1.3 line. If everything is ok,
then commit it (with the -F flag so the svnmerge commit message is
used), and then write a post asking for the branch to be merged. It
would be best to start a new thread (i.e. not replying to a mail) for
this.
Cheers,
Edward
On 2 August 2011 09:40, Han Sun <hasu@xxxxxxxxxxxxxxxxx> wrote:
Hi Edwawrd,
ok, now I get this point. So should I update this again now or do you
think
it already fine?
Best
Han
On Aug 1, 2011, at 5:53 PM, Edward d'Auvergne wrote:
Hi Han,
Be very careful! You only need to initialise svnmerge once at the
very start on a branch, not every time you want to merge in the
changes from the main line. For updating a branch, you only need to
type 2 commands:
$ svnmerge.py merge
Fix the conflicts, if any, and then:
$ svn ci -F svnmerge-commit-message.txt
I hope like last time this commit won't cause any problems :S
Regards,
Edward
On 1 August 2011 17:39, <hasu@xxxxxxxxxxxxxxxxx> wrote:
Author: han87
Date: Mon Aug 1 17:39:06 2011
New Revision: 14039
URL: http://svn.gna.org/viewcvs/relax?rev=14039&view=rev
Log:
Initialized merge tracking via "svnmerge" with revisions "1-12830"
from
svn+ssh://han87@xxxxxxxxxxx/svn/relax/1.3
Modified:
branches/xyz/ (props changed)
Propchange: branches/xyz/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 1 17:39:06 2011
@@ -1,1 +1,1 @@
-/1.3:1-13944
+/1.3:1-13944 /1.3:1-12830
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-devel mailing list
relax-devel@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-devel
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-devel mailing list
relax-devel@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-devel