svn - Merging Subversion Branches -

-

just asking simple question. best way merge 2 subversion branches together?

i wish merge branch name 3661 branch name 2011-01-17

3661 has revision code of 16658

2011-01-17 has revision code of 16613

this how (i use command line)

(1) revision of 3661 when branch created this

svn log --verbose --stop-on-copy http://url/to/branch/3661

take smallest revision output. let's it's 911

(2) checkout latest of branch 2011-01-17, , run in main directory. show conflicts , updates won't anything.

 svn merge --dry-run -r 911:head http://url/to/branch/3661

(3) if ok changes actual merge

 svn merge -r 911:head http://url/to/branch/3661

nothing committed on server yet. it's local copy merged. may want fix conflicted file now.

(4) if want persist merge on server commit changed files doing this

 svn commit -m "merged 3661 changes 2011-01-17"

hopefully helps. may want see chapter of red book http://svnbook.red-bean.com/en/1.0/ch04s04.html

also, need command line svn client. can download subversion's website


Comments

Post a Comment

Popular posts from this blog

java - SNMP4J General Variable Binding Error -

-
i trying use snmp4j snmp bulkget. when ever use snmp4j make call returned responseevent error says "general variable binding error" , data returned equal null. to debug: print out, console, exact oid , version number using in snmp4j. use printed out data snmpwalk on command line. valid results. know sending snmp4j correct pdu correct oid, version number, max repititions, etc. i have used snmp4j , code wrote succesffuly monitor other devices years. don't know different time. leaving me stumped. why "general variable binding error?" causes error? ideas debug? can reproduced? if so, first action should using wireshark or microsoft network monitor capture network packets. my guess agent gives generr response, not surprising, http://www.ietf.org/rfc/rfc1157.txt
Read more

windows - Python Service Installation - "Could not find PythonClass entry" -

-
i working on building python service. inducing error, not sure inducing it. ps c:\...> python .\file.py debug debugging service myservice - press ctrl+c stop. error 0xc00000f4 - not find service's pythonclass entry in registry error 1814 - specified resource name cannot found in image file. error 0xc0000080 - not locate module name in python class string (ie, no '.') this error coming pythonservicemessages.mc in pythonwin32. it turns out error result caused exception being thrown , python script dying off.
Read more

Determine if a XmlNode is empty or null in C#? -

-
the following code takes xmlnode data type , populates dataset object xmlnode content. write dataset's content file. public void populatedataset(xmlnode node) { xmlnodereader reader = new xmlnodereader(node); dataset ds = new dataset(); ds.readxml(reader); system.guid guid = system.guid.newguid(); string name = string.format("{0}{1}_{2}.xml", utility.xmloutputpath, utility.xmloutputfilename, guid.tostring()); //need write "node empty" file if xmlnode object empty of null ds.writexml(name, xmlwritemode.ignoreschema); } the problem encountered 1 scenario not write content file. how determine if xmlnode object null or empty? you can check if node parameter null or has innertext or innerxml properties null or empty, when enter method before creating xmlnodereader .
Read more