| === Guest59860 is now known as LoganCloud | ||
| === fredp` is now known as fredp | ||
| quicksilver | is there a commandline way to say "list the files which were modified in versions X..Y" ? | 09:57 |
|---|---|---|
| quicksilver | the info from bzr log -v, but just the files changed | 09:57 |
| * quicksilver opts for bzr diff -rX | egrep '^===' | awk -F\' '{print $2}' | 10:02 | |
| fullermd | stat takes -r | 10:05 |
| quicksilver | ah, that would have worked | 10:06 |
| quicksilver | thanks :) | 10:06 |
| === mmrazik is now known as mmrazik|lunch | ||
| === mmrazik|lunch is now known as mmrazik | ||
| === wedgwood_away is now known as wedgwood | ||
| === wedgwood is now known as Guest28578 | ||
| === mmrazik is now known as mmrazik|otp | ||
| === mmrazik|otp is now known as mmrazik | ||
| === ianbrandt_ is now known as ianbrandt | ||
| ggherdov | Hi all. This is the kind of questions that, when I'll be able to answer it w/o a blink, I'll consider myself good at version control. You have the situation shown in this picture http://imgur.com/AqeYP4H , where both Tigger and Winnie fork from a repo; Tigger adds file X ; Winnie likes it and merges Tigger's branch; Winnie doesn't touch file X anymore; Tigger continues working on file X; | 18:06 |
| ggherdov | at a given point, they both converge (are merged) to the original repo. Question: is this a conflict, or the algorithm is smart enough to understand that Tigger has the most updated version? | 18:07 |
| beuno | ggherdov, these are text files, yes? | 18:09 |
| ggherdov | beuno: yep | 18:09 |
| beuno | ggherdov, so it'll try and do a clean merge if the changes are on different lines | 18:09 |
| beuno | and if not, conflict | 18:09 |
| beuno | you get to resolve and decide what wins manually | 18:09 |
| beuno | I'm pretty sure bzr has no sense of time in merges | 18:10 |
| beuno | (timestamps are computer-specific) | 18:10 |
| ggherdov | beuno: so you say that bzr would rise a conflict? (yes, line "boo" is changed to "baloo") I see. | 18:11 |
| ggherdov | i'll check and see | 18:11 |
| beuno | ggherdov, there was no change to "boo" in the winnie branch | 18:12 |
| beuno | so when merging in, it shouldn't overwrite it | 18:12 |
| ggherdov | beuno: exactly (sorry I was afk for a lil while) | 18:20 |
| === r0bby_ is now known as robbyoconnor | ||
| === wedgwood is now known as wedgwood_away | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!