{"thread":{"id":"1618","subject":"cogito and merging in steps.","startedAt":"2005-08-23T06:29:46Z","lastAt":"2005-09-12T00:11:05Z","messageCount":2,"participants":["Martin Langhoff","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7642","messageId":"46a038f9050822232961140d4b@mail.gmail.com","threadId":"1618","inReplyTo":null,"subject":"cogito and merging in steps.","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2005-08-23T06:29:46Z","receivedAt":"2005-08-23T06:29:46Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"Is there any way to merge patches \"selectively\"? \n\nI have found that if I do \n\n   cg-pull\n   cg-log -r master:origin\n\nI can review the commits that will be merged if I do cg-update. \n\nSay I do cg-update, it brings a lot of commits and there is a messy\nconflict. I immediately can  narrow down on which commit I am merging\nit is that has a conflict.\n\nWith this info, it'd be interesting to be able to merge not to the tip\nof the head (head of the head? =- bah, tip of the branch! :) but to an\nearlier commit, so I can resolve the conflict with a more specific\ncommit.\n\nSay I am merging a series of 10 commits that happened in the shared\nrepo to the project while I worked disconnected (and did lots of local\ncommits). The first 8 commits merge cleanly, the 9th is an ugly\nconflict I have to resolve, and the 10th is clean and unrelated.\n\nI want to be able to \n - cg-update\n - oops! this is a mess! review with cg-log -r master:origin\n - aha! Here is the conflict in the 9th commit from MacFroz, fire off\nemail / open irc session\n - in the meantime, reset the working copy and merge the 8 clean ones\nwith something like: cg-restore ; cg-update origin^^^ ; cg-commit\n - cg-update origin^ ; emacs file-with-conflict.c ; cg-commit \n - cg-update # bring in the last pending commit from origin. \n\nHow can I achieve the cg-update <somepointinthebranch> ; cg-commit ? I\nmean, without faking a head with\n\n  echo <somepointinthebranch> > .git/refs/heads/temphead \n\ncheers,\n\n\nmartin\ncheers,\n\n\nmartin\n"},{"id":"8342","messageId":"20050912001105.GC15630@pasky.or.cz","threadId":"1618","inReplyTo":"46a038f9050822232961140d4b@mail.gmail.com","subject":"Re: cogito and merging in steps.","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-09-12T00:11:05Z","receivedAt":"2005-09-12T00:11:05Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Tue, Aug 23, 2005 at 08:29:46AM CEST, I got a letter\nwhere Martin Langhoff <martin.langhoff@gmail.com> told me that...\n> I want to be able to \n>  - cg-update\n>  - oops! this is a mess! review with cg-log -r master:origin\n>  - aha! Here is the conflict in the 9th commit from MacFroz, fire off\n> email / open irc session\n>  - in the meantime, reset the working copy and merge the 8 clean ones\n> with something like: cg-restore ; cg-update origin^^^ ; cg-commit\n>  - cg-update origin^ ; emacs file-with-conflict.c ; cg-commit \n>  - cg-update # bring in the last pending commit from origin. \n> \n> How can I achieve the cg-update <somepointinthebranch> ; cg-commit ? I\n> mean, without faking a head with\n> \n>   echo <somepointinthebranch> > .git/refs/heads/temphead \n\nTheoretically, it should be as easy as\n\n\tcg-merge <somepointinthebranch>\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nIf you want the holes in your knowledge showing up try teaching\nsomeone.  -- Alan Cox\n"}]}