Menu
▾
▴
javagit-codereview
|
From: Ross S. <ros...@ny...> - 2008-07-17 07:25:38
|
Hey gang, I made those changes related to how we create GitFile/ GitDirectory objects. It's in review here: http://linserv3.cims.nyu.edu:11000/cru/Javagit-4 Please throw me some feedback. James - I haven't finished yours that I started Tuesday - will do so tomorrow, but if you'd like to just close it out and keep moving, that's a-okay by me. Please note that I still haven't mastered the art of checking in just my stuff (I merged trunk into my code review branch, which had grown stale, and when I checked it all in, I got some of Max's changes in my commit too). What should I have done in this case? -- I made a new branch on Monday -- I made my changes today -- A bunch of changes were made between Monday and now to trunk -- I merged head of trunk into my code review branch, which already had my changes -- I resolved a bunch of conflicts -- I committed the final product Without something like a git-stash, how do I merge the updated trunk stuff into my branch and commit it in a separate commit without losing the work I've already done in my branch? |
|
From: Michael S. <mic...@cs...> - 2008-07-17 14:56:03
|
On Thu, Jul 17, 2008 at 3:24 AM, Ross Snyder <ros...@ny...> wrote: > Hey gang, I made those changes related to how we create GitFile/ > GitDirectory objects. It's in review here: > > http://linserv3.cims.nyu.edu:11000/cru/Javagit-4 > > Please throw me some feedback. James - I haven't finished yours that > I started Tuesday - will do so tomorrow, but if you'd like to just > close it out and keep moving, that's a-okay by me. > > Please note that I still haven't mastered the art of checking in just > my stuff (I merged trunk into my code review branch, which had grown > stale, and when I checked it all in, I got some of Max's changes in > my commit too). What should I have done in this case? > > -- I made a new branch on Monday > -- I made my changes today > -- A bunch of changes were made between Monday and now to trunk > -- I merged head of trunk into my code review branch, which already > had my changes > -- I resolved a bunch of conflicts > -- I committed the final product > > Without something like a git-stash, how do I merge the updated trunk > stuff into my branch and commit it in a separate commit without > losing the work I've already done in my branch? There's no easy answer to merging code into a stale client that has lots of your own changes in it. Even git-stash wouldn't help you. At some point someone has to reconcile the set of changes you're making with the set of changes made on the repository. That having been said, if you merged properly you shouldn't have lost any of your local work. -Michael > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Javagit-codereview mailing list > Jav...@li... > https://lists.sourceforge.net/lists/listinfo/javagit-codereview > > |
|
From: Ross S. <ros...@ny...> - 2008-07-17 15:13:05
|
On Jul 17, 2008, at 10:56 AM, Michael Schidlowsky wrote: > On Thu, Jul 17, 2008 at 3:24 AM, Ross Snyder <ros...@ny...> > wrote: >> Hey gang, I made those changes related to how we create GitFile/ >> GitDirectory objects. It's in review here: >> >> http://linserv3.cims.nyu.edu:11000/cru/Javagit-4 >> >> Please throw me some feedback. James - I haven't finished yours that >> I started Tuesday - will do so tomorrow, but if you'd like to just >> close it out and keep moving, that's a-okay by me. >> >> Please note that I still haven't mastered the art of checking in just >> my stuff (I merged trunk into my code review branch, which had grown >> stale, and when I checked it all in, I got some of Max's changes in >> my commit too). What should I have done in this case? >> >> -- I made a new branch on Monday >> -- I made my changes today >> -- A bunch of changes were made between Monday and now to trunk >> -- I merged head of trunk into my code review branch, which already >> had my changes >> -- I resolved a bunch of conflicts >> -- I committed the final product >> >> Without something like a git-stash, how do I merge the updated trunk >> stuff into my branch and commit it in a separate commit without >> losing the work I've already done in my branch? > > There's no easy answer to merging code into a stale client that has > lots of your own changes in it. Even git-stash wouldn't help you. At > some point someone has to reconcile the set of changes you're making > with the set of changes made on the repository. That having been > said, if you merged properly you shouldn't have lost any of your local > work. I was thinking git stash would've allowed me to: - stash away my current changes - merge trunk into my branch - commit - un-stash my changes, resolve conflicts - commit Would that work? That way, at least the 2nd commit would be solely my stuff. As it stands, some of the changed lines in my code review are actually changes other people made to trunk. |
|
From: Michael S. <mic...@cs...> - 2008-07-17 15:49:33
|
Just to clarify, are you using git-svn or just svn? -Michael On Thu, Jul 17, 2008 at 11:11 AM, Ross Snyder <ros...@ny...> wrote: > On Jul 17, 2008, at 10:56 AM, Michael Schidlowsky wrote: > >> On Thu, Jul 17, 2008 at 3:24 AM, Ross Snyder <ros...@ny...> wrote: >>> >>> Hey gang, I made those changes related to how we create GitFile/ >>> GitDirectory objects. It's in review here: >>> >>> http://linserv3.cims.nyu.edu:11000/cru/Javagit-4 >>> >>> Please throw me some feedback. James - I haven't finished yours that >>> I started Tuesday - will do so tomorrow, but if you'd like to just >>> close it out and keep moving, that's a-okay by me. >>> >>> Please note that I still haven't mastered the art of checking in just >>> my stuff (I merged trunk into my code review branch, which had grown >>> stale, and when I checked it all in, I got some of Max's changes in >>> my commit too). What should I have done in this case? >>> >>> -- I made a new branch on Monday >>> -- I made my changes today >>> -- A bunch of changes were made between Monday and now to trunk >>> -- I merged head of trunk into my code review branch, which already >>> had my changes >>> -- I resolved a bunch of conflicts >>> -- I committed the final product >>> >>> Without something like a git-stash, how do I merge the updated trunk >>> stuff into my branch and commit it in a separate commit without >>> losing the work I've already done in my branch? >> >> There's no easy answer to merging code into a stale client that has >> lots of your own changes in it. Even git-stash wouldn't help you. At >> some point someone has to reconcile the set of changes you're making >> with the set of changes made on the repository. That having been >> said, if you merged properly you shouldn't have lost any of your local >> work. > > I was thinking git stash would've allowed me to: > > - stash away my current changes > - merge trunk into my branch > - commit > - un-stash my changes, resolve conflicts > - commit > > Would that work? That way, at least the 2nd commit would be solely my > stuff. As it stands, some of the changed lines in my code review are > actually changes other people made to trunk. > > |
|
From: Ross S. <ros...@ny...> - 2008-07-17 15:55:32
|
Just svn - I know we discussed switching over, but I haven't made the leap yet. On Jul 17, 2008, at 11:49 AM, Michael Schidlowsky wrote: > Just to clarify, are you using git-svn or just svn? > > -Michael > > > On Thu, Jul 17, 2008 at 11:11 AM, Ross Snyder <ros...@ny...> > wrote: >> On Jul 17, 2008, at 10:56 AM, Michael Schidlowsky wrote: >> >>> On Thu, Jul 17, 2008 at 3:24 AM, Ross Snyder >>> <ros...@ny...> wrote: >>>> >>>> Hey gang, I made those changes related to how we create GitFile/ >>>> GitDirectory objects. It's in review here: >>>> >>>> http://linserv3.cims.nyu.edu:11000/cru/Javagit-4 >>>> >>>> Please throw me some feedback. James - I haven't finished yours >>>> that >>>> I started Tuesday - will do so tomorrow, but if you'd like to just >>>> close it out and keep moving, that's a-okay by me. >>>> >>>> Please note that I still haven't mastered the art of checking in >>>> just >>>> my stuff (I merged trunk into my code review branch, which had >>>> grown >>>> stale, and when I checked it all in, I got some of Max's changes in >>>> my commit too). What should I have done in this case? >>>> >>>> -- I made a new branch on Monday >>>> -- I made my changes today >>>> -- A bunch of changes were made between Monday and now to trunk >>>> -- I merged head of trunk into my code review branch, which already >>>> had my changes >>>> -- I resolved a bunch of conflicts >>>> -- I committed the final product >>>> >>>> Without something like a git-stash, how do I merge the updated >>>> trunk >>>> stuff into my branch and commit it in a separate commit without >>>> losing the work I've already done in my branch? >>> >>> There's no easy answer to merging code into a stale client that has >>> lots of your own changes in it. Even git-stash wouldn't help >>> you. At >>> some point someone has to reconcile the set of changes you're making >>> with the set of changes made on the repository. That having been >>> said, if you merged properly you shouldn't have lost any of your >>> local >>> work. >> >> I was thinking git stash would've allowed me to: >> >> - stash away my current changes >> - merge trunk into my branch >> - commit >> - un-stash my changes, resolve conflicts >> - commit >> >> Would that work? That way, at least the 2nd commit would be >> solely my >> stuff. As it stands, some of the changed lines in my code review are >> actually changes other people made to trunk. >> >> |
|
From: Michael S. <mic...@cs...> - 2008-07-17 16:03:43
|
ah, ok. On Thu, Jul 17, 2008 at 11:54 AM, Ross Snyder <ros...@ny...> wrote: > Just svn - I know we discussed switching over, but I haven't made the leap > yet. > > On Jul 17, 2008, at 11:49 AM, Michael Schidlowsky wrote: > >> Just to clarify, are you using git-svn or just svn? >> >> -Michael >> >> >> On Thu, Jul 17, 2008 at 11:11 AM, Ross Snyder <ros...@ny...> wrote: >>> >>> On Jul 17, 2008, at 10:56 AM, Michael Schidlowsky wrote: >>> >>>> On Thu, Jul 17, 2008 at 3:24 AM, Ross Snyder <ros...@ny...> >>>> wrote: >>>>> >>>>> Hey gang, I made those changes related to how we create GitFile/ >>>>> GitDirectory objects. It's in review here: >>>>> >>>>> http://linserv3.cims.nyu.edu:11000/cru/Javagit-4 >>>>> >>>>> Please throw me some feedback. James - I haven't finished yours that >>>>> I started Tuesday - will do so tomorrow, but if you'd like to just >>>>> close it out and keep moving, that's a-okay by me. >>>>> >>>>> Please note that I still haven't mastered the art of checking in just >>>>> my stuff (I merged trunk into my code review branch, which had grown >>>>> stale, and when I checked it all in, I got some of Max's changes in >>>>> my commit too). What should I have done in this case? >>>>> >>>>> -- I made a new branch on Monday >>>>> -- I made my changes today >>>>> -- A bunch of changes were made between Monday and now to trunk >>>>> -- I merged head of trunk into my code review branch, which already >>>>> had my changes >>>>> -- I resolved a bunch of conflicts >>>>> -- I committed the final product >>>>> >>>>> Without something like a git-stash, how do I merge the updated trunk >>>>> stuff into my branch and commit it in a separate commit without >>>>> losing the work I've already done in my branch? >>>> >>>> There's no easy answer to merging code into a stale client that has >>>> lots of your own changes in it. Even git-stash wouldn't help you. At >>>> some point someone has to reconcile the set of changes you're making >>>> with the set of changes made on the repository. That having been >>>> said, if you merged properly you shouldn't have lost any of your local >>>> work. >>> >>> I was thinking git stash would've allowed me to: >>> >>> - stash away my current changes >>> - merge trunk into my branch >>> - commit >>> - un-stash my changes, resolve conflicts >>> - commit >>> >>> Would that work? That way, at least the 2nd commit would be solely my I'm not sure what problems you ran into... normally if you make changes locally, then bring in changes that someone else made, and then do a commit, the commit should only include your new changes and not re-include the changes that you pulled down from the server. I think we'd have to look at a specific example to work through the problem you had. If you can put together an example with some real code that we can try it might be useful. Also, don't forget the command svn status -u (that will show you the svn status including new changes on the server). -Michael >>> stuff. As it stands, some of the changed lines in my code review are >>> actually changes other people made to trunk. >>> >>> > > |
Thanks for helping keep SourceForge clean.
X