On Sat, Apr 30, 2016 at 6:23 AM, Steve Schow <st...@bstage.com> wrote:
> More Noob questions. > > Trying to understand the subtle difference between the checkout command > and update. is it fair to say that checkout will stomp over the top of the > current working checkout area with the repo version you checkout from, > while the update command will merge the changes into the working checkout > merging the actual code in and retaining the work in progress? Do I have > that right? > That's a fair summary, yes. > what happens if an update VERSION is specified that is not a descendant of > the node we checked out from? What if the VERSION is on a completely > different branch? > Good question... err, this machine doesn't have fossil, so i can't try it out to see what happens. > In both merging and updating, there is a possibility for merge conflicts. > update -n will let us check to see if there are some but what is the > automated way to resolve merge conflicts during or just prior to a merge? There is no automated way to resolve conflicts. By their nature, they require human intervention to solve. > The 3 way merge command is probably the way to do it I guess, so I am > assuming the answer to my question is in order to bring a working checkout > up to date with the branch its on, first run update -n, if there are noted > merge conflicts, then use the information to run the 3 way merge tool to > update the working checkout in such a way that running update -n no longer > produces a merge conflict, then finally run update to bring the working > checkout completely up to date with the branch it its on, and work in > progress still retained. Do I have that right? Any suggestions about > automating that process? > i'm not certain there is such a method, but someone else may correct my ignorance on the topic. fossil update does an implicit pull before bringing the repo up to date > before bringing the working checkout up to the leaf of the branch its on, > presuming you don’t try some funny business with the VERSION argument, does > fossil checkout also do an implicit pull? > IIRC (maybe wrong) that depends on the autosync config setting, but my new PC doesn't have any dev tools on it (because having them tempts me into using them (my will is weak), and that just aggravates my elbow nerve injury), so i can't confirm that off hand :/. -- ----- stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
