Hi, I think I have the branch back in a workable state. The test suite now passes, and all of the changes of the 1.3 line are now in the branch. Sorry for taking over the branch. With the multiple svnmerge.py initialisations it had unfortunately become unstable and very difficult to fix. I hope that it will not be a problem to merge back into the main line. If everything is ok with you and you give the go-ahead, I will attempt to merge the branch and then delete it.
Regards, Edward On 2 August 2011 16:13, Han Sun <[email protected]> wrote: > Hi Edward, > > thanks for this instruction. Now the conflict problem is solved. And I have > performed the svnmerge.py again without initialization as you can see in > r14068. > > Best, > Han > > > On Aug 2, 2011, at 4:05 PM, Edward d'Auvergne wrote: > >> Hi, >> >> Try to clean up your copy first. Firstly, you should see nothing if you >> type: >> >> $ svn st >> >> If there are problems, try a full reversion: >> >> $ svn revert -R . >> >> Then try: >> >> $ svn cleanup >> >> Once everything is happy and looks like a freshly checked out copy, >> perform the reversion: >> >> $ svn merge -r14039:14038 . >> >> Hopefully that will solve the issue. Otherwise you might have to >> delete the entire checked out branch, and then checkout a clean copy. >> >> Regards, >> >> Edward >> >> >> >> On 2 August 2011 16:00, Han Sun <[email protected]> wrote: >>> >>> Hi Edward, >>> >>> I tried to revert this revision, but it shows that the conflict was >>> found. >>> >>> Conflict for property 'svnmerge-integrated' discovered on ''. >>> Select: (p) postpone, (df) diff-full, (e) edit, >>> (s) show all options: >>> >>> Then I typed 'p' and by typing svn st I can see that the conflict is >>> still >>> there. So should I still revise this revision or it is already helpless? >>> >>> Best, >>> Han >>> >>> On Aug 2, 2011, at 12:31 PM, Edward d'Auvergne wrote: >>> >>>> Hi, >>>> >>>> I've been playing around with your branch, and that previous 3rd >>>> svnmerge initialisation is clearly fatal :S You will have to revert >>>> that revision, and hopefully I won't have problems with the merge >>>> process. The worst case would be that we have to create a new branch, >>>> and port every revision from the xyz branch (excluding the svnmerge >>>> ones) one-by-one. Hopefully it doesn't come to that though. See what >>>> happens when you revert r14039 first. >>>> >>>> Regards, >>>> >>>> Edward >>>> >>>> >>>> On 2 August 2011 11:28, Han Sun <[email protected]> wrote: >>>>> >>>>> 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 <[email protected]> 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, <[email protected]> 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://[email protected]/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 >>>>>>>>> [email protected] >>>>>>>>> >>>>>>>>> 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 >>>>>>>> [email protected] >>>>>>>> >>>>>>>> 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 >>>>>> [email protected] >>>>>> >>>>>> 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 [email protected] 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
