| === thomi_ is now known as thomi | ||
| * jelmer waves | 06:59 | |
| === hunger_ is now known as hunger | ||
| === med_out is now known as medberry | ||
| tbf | what's the equiv of "git add -p" in bzr? | 20:53 |
|---|---|---|
| tbf | that is: how do i add only parts of a file's changes to the index? | 20:54 |
| vila | tbf: Hmm, there is no index in bzr, but you should be able to shelve the changes you don't want to commit with 'bzr shelve --interactive' | 20:55 |
| tbf | vila: thanks. reading docs for "bzr shelve" | 20:56 |
| tbf | vila: seems to work. thank you | 20:57 |
| vila | tbf: Always happy to help ! (TM jam) | 20:58 |
| tbf | vila: sorry for asking another stupid question: is it possible to edit commits? forgot to call "bzr whoami" and want to change the commiter id | 21:04 |
| vila | tbf: you can't edit commits, but you can 'bzr uncommit' ; 'bzr whoami "<yes, really me@example.com>"', bzr commit (for the last commit) | 21:05 |
| tbf | vila: "bzr uncommit" keeps the files? | 21:06 |
| vila | tbf: The 'I forgot whoami' trap is known :-/ | 21:06 |
| vila | tbf: bzr uncommit don't touch any user file, it just move the branch pointer back so the changes are ready to commit | 21:07 |
| tbf | vila: thanks. together with bzr shelve i managed to correct the log :-) | 21:08 |
| vila | tbf: great, that's the best way to fix that today, we're working on better ways... (Both in preventing the user to forget the whoami and re-recreate commits with a fixed one) | 21:10 |
| tbf | vila: well, actually had $EMAIL set for devscripts and git... so bzr is not really to blame. | 21:12 |
| vila | Huh ? EMAIL has not be recognized ? That's a bug ! | 21:13 |
| tbf | vila: my fault to use the other dvcs without rtfm :-) | 21:13 |
| tbf | vila: it is recognized but mentions my work email address | 21:13 |
| vila | haaa | 21:13 |
| vila | So you *did* configure the other dvcs then ? ;) | 21:14 |
| tbf | vila: now it becomes tricky. whom's "other dvcs"? mine or yours? :-D | 21:14 |
| vila | hehe | 21:15 |
| vila | tbf: Since you introduce the term, you have to define it ;) | 21:15 |
| vila | tbf: jokes aside, with "other_dvcs != bzr", how did you specified your email ? | 21:17 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!