Camelia, the Perl 6 bug

IRC log for #cdk, 2009-12-18

| Channels | #cdk index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
07:04 slyrus joined #cdk
09:14 CIA-74 cdk: annulen * r15210 /jchempaint/trunk/src/main/org/openscience​/jchempaint/AbstractJChemPaintPanel.java: added isModified()
09:42 egonw_ joined #cdk
10:53 egonw__ joined #cdk
12:02 Asad_ joined #cdk
12:03 Asad_ Hello everyone
12:05 egonw hi Asad_
12:06 Asad_ How to rebase the cdk master for SMSD :-)
12:13 egonw Asad_: git format-patch -o smsd-patches  56adf239b0bc0150073e9b9004f0df2f6e7a86d8
12:13 egonw 56adf... is the last commit *before* the patches in your branch
12:13 egonw so this 'git format-patch' command will create 283 patches in the smsd-patches/ directory
12:13 egonw which is what the -o option is for
12:14 Asad_ I guess mine last path shows Author: asad <asad@ebi.ac.uk> 2009-12-18 08:53:35 GMT+00:00
12:14 Asad_ Committer: asad <asad@ebi.ac.uk> 2009-12-18 08:53:35 GMT+00:00
12:14 Asad_ Parent: 683f929822f3f778521a5d6600b87203f47275a3 (Fixed PMD for the classes CDKMCS and McGregor)
12:14 Asad_ could you please test it
12:14 egonw yes, that's what I have too
12:15 egonw ok, you have the smsd-patches/ folder now?
12:15 egonw with 0001-foo.patch to 0283-bar.patch ?
12:15 Asad_ yes
12:15 Asad_ I have this folder
12:15 egonw ok
12:15 Asad_ 284 files
12:16 egonw now we create a new branch from master:
12:16 egonw git checkout -b 101-smsdRebase master
12:16 Asad_ I have 284 files
12:16 Asad_ okay
12:16 egonw the 101-smsdRebase branch name is arbitrary
12:16 egonw I prepend a number, which gives me some historical info on when that branch was created
12:16 egonw this happens to be the 101th one :)
12:17 Asad_ :-)
12:17 egonw this give you a new branch, based on the current master
12:17 egonw oh... what's the last master commit you have?
12:17 Asad_ git checkout -b 101-smsdRebase master
12:17 Asad_ fatal: git checkout: updating paths is incompatible with switching branches.
12:17 Asad_ Did you intend to checkout 'master' which can not be resolved as commit?
12:17 egonw ok, sorry about that...
12:17 Asad_ this is what I got
12:18 egonw I assumed that you have a master there too...
12:18 egonw from my CDK version...
12:18 Asad_ so what to do
12:18 egonw do you have my CDK git repository on GitHub or SF as remote?
12:18 egonw try:
12:18 egonw git remote -v
12:19 Asad_ git remote -v
12:19 Asad_ origingit@github.com:asad/cdk-smsd.git (fetch)
12:19 Asad_ origingit@github.com:asad/cdk-smsd.git (push)
12:19 Asad_ I have set SMSD as default
12:19 Asad_ but I guess I did fork the original master
12:20 egonw OK, do this:
12:21 egonw git remote add cdkmain git@github.com:egonw/cdk.git
12:21 CIA-74 cdk: shk3 * r15211 /cdk-web/trunk/ (48 files in 7 dirs): updated the applet
12:21 egonw crap
12:21 egonw no, not that one
12:21 Asad_ oh
12:21 egonw git remote add cdkmain git@github.com:egonw/cdk.git
12:21 Asad_ it remote add cdkmain mailto:git@github.comcom:egonw/cdk.git
12:21 egonw damn copy/paste
12:21 egonw git remote add cdkmain git://github.com/egonw/cdk.git
12:21 egonw that one
12:21 egonw with the git://
12:22 egonw no mailto: either :)
12:22 Asad_ "git remote add cdkmain git://github.com/egonw/cdk.git"
12:22 egonw yes
12:23 Asad_ I yped in this command
12:23 Asad_ typed
12:23 egonw yes :)
12:23 egonw guessed that :)
12:23 Asad_ so
12:23 egonw git fetch cdkmain
12:24 Asad_ "git fetch cdkmain
12:24 Asad_ remote: Counting objects: 2333, done.
12:24 Asad_ remote: Compressing objects: 100% (763/763), done.
12:24 Asad_ remote: Total 1925 (delta 1117), reused 1597 (delta 857)
12:24 Asad_ Receiving objects: 100% (1925/1925), 6.26 MiB | 749 KiB/s, done.
12:24 Asad_ Resolving deltas: 100% (1117/1117), completed with 278 local objects.
12:24 Asad_ From git://github.com/egonw/cdk
12:24 Asad_ * [new branch]      73-rdf     -> cdkmain/73-rdf
12:24 Asad_ * [new branch]      81-ojdcheck -> cdkmain/81-ojdcheck
12:24 egonw cool
12:24 Asad_ * [new branch]      cdk-1.2.x  -> cdkmain/cdk-1.2.x
12:24 Asad_ * [new branch]      master     -> cdkmain/master
12:24 Asad_ From git://github.com/egonw/cdk
12:24 Asad_ * [new tag]         cdk-1.2.4  -> cdk-1.2.4
12:24 Asad_ * [new tag]         cdk-1.2.4.1 -> cdk-1.2.4.1
12:24 Asad_ * [new tag]         cdk-1.3.1  -> cdk-1.3.1
12:24 Asad_ "
12:24 Asad_ this is what I got
12:25 Asad_ :) now
12:25 egonw perfec
12:25 egonw t
12:25 egonw git checkout -b 101-smsdRebase cdkmain/master
12:26 Asad_ Branch 101-smsdRebase set up to track remote branch master from cdkmain.
12:26 Asad_ Switched to a new branch '101-smsdRebase'
12:26 egonw good
12:26 egonw OK, now we are going to apply the patches
12:26 Asad_ okay
12:26 egonw not all will apply
12:26 egonw or are needed...
12:27 Asad_ hmm
12:27 egonw at least 2 can be skipped
12:27 Asad_ so lets start the marathon
12:27 egonw OK, 'git am' is the command which we are going to use next...
12:27 egonw git am smsd-patches/0001-added-SMSD-Small-Mol​ecule-Subgraph-Detector-toolkit.patch
12:27 Asad_ is there a for loop :-)
12:27 egonw yes
12:28 egonw we'll get to that later :)
12:28 egonw 0002 and 0004 will not apply
12:28 egonw that's why we'll take it slowly for now
12:28 Asad_ git am smsd-patches/0001-added-SMSD-Small-Mol​ecule-Subgraph-Detector-toolkit.patch
12:28 Asad_ Applying: added SMSD(Small Molecule Subgraph Detector) toolkit
12:28 Asad_ *
12:28 Asad_ *
12:28 egonw to check what a patch is doing... just look at the content
12:28 Asad_ * @throws EBIException
12:28 Asad_ *
12:28 Asad_ *
12:28 Asad_ warning: squelched 192 whitespace errors
12:28 Asad_ warning: 197 lines add whitespace errors.
12:29 egonw yes, it's complaining about whitespace
12:29 egonw it can also fix that on the fly
12:29 egonw ok, undo this commit (just for educational purposes :)
12:29 egonw git reset HEAD~1
12:29 jbrefort joined #cdk
12:30 Asad_ done
12:31 egonw type git status
12:31 egonw you'll see that it now still have the folders, which we need to remove first:
12:31 Asad_ git status
12:31 Asad_ # On branch 101-smsdRebase
12:31 Asad_ # Untracked files:
12:31 Asad_ #   (use "git add <file>..." to include in what will be committed)
12:31 Asad_ #
12:31 Asad_ #nbproject/
12:31 Asad_ #smsd-patches/
12:31 Asad_ #src/main/org/openscience/cdk/smsd/
12:31 Asad_ nothing added to commit but untracked files present (use "git add" to track)
12:31 egonw \rm -Rf src/main/org/openscience/cdk/smsd/ nbproject/
12:32 Asad_ did
12:32 egonw then
12:32 egonw git am --whitespace=fix smsd-patches/0001-added-SMSD-Small-Mol​ecule-Subgraph-Detector-toolkit.patch
12:33 Asad_ Applying: added SMSD(Small Molecule Subgraph Detector) toolkit
12:33 Asad_ *
12:33 Asad_ *
12:33 Asad_ * @throws EBIException
12:33 Asad_ *
12:33 Asad_ *
12:33 Asad_ warning: squelched 192 whitespace errors
12:33 Asad_ warning: 182 lines applied after fixing whitespace errors.
12:33 egonw grmphh...
12:33 egonw it was supposed to fix those :(
12:33 egonw mom
12:33 egonw I had the same
12:34 Asad_ so
12:34 egonw ah, ok, according to the docs, it cannot fix all errors...
12:34 egonw OK, use from now on just:
12:34 egonw --whitespace=nowarn
12:34 Asad_ okay
12:34 egonw more smsd-patches/0002-added-SMSD-Small-Mol​ecule-Subgraph-Detector-toolkit.patch
12:34 egonw more smsd-patches/0004-added-SMSD-Small-Mol​ecule-Subgraph-Detector-toolkit.patch
12:34 egonw those patches should be empty
12:35 Asad_ yes
12:35 egonw so, next step:
12:36 egonw git am smsd-patches/0003-Changed-Vector-foo-t​o-List-foo-wherever-appropriate.patch
12:36 egonw but that horribly fails
12:36 egonw so don't do that yet
12:36 egonw perhaps the whitespace fixing was not a good idea :)
12:36 * egonw is still bumping into git issues too :)
12:36 egonw ok
12:37 egonw let's backtrack
12:37 egonw please do:
12:37 egonw git checkout master
12:37 egonw git branch -D 101-smsdRebase
12:37 Asad_ it checkout master
12:37 Asad_ error: pathspec 'master' did not match any file(s) known to git.
12:37 egonw git checkout -b 101-smsdRebase
12:37 egonw ah right
12:37 egonw ok, please do:
12:38 egonw git checkout -b master cdkmain/master
12:38 egonw git checkout master
12:38 egonw git checkout -b 101-smsdRebase
12:38 Asad_ asad:cdk-smsd Asad$ git checkout -b master cdkmain/master
12:38 Asad_ Branch master set up to track remote branch master from cdkmain.
12:38 Asad_ Switched to a new branch 'master'
12:38 Asad_ asad:cdk-smsd Asad$ git checkout -b 101-smsdRebase
12:38 Asad_ fatal: git checkout: branch 101-smsdRebase already exists
12:38 egonw ok, forgot this line:
12:38 egonw git branch -D 101-smsdRebase
12:38 egonw so, full sequence:
12:39 egonw git checkout -b master cdkmain/master
12:39 egonw git branch -D 101-smsdRebase
12:39 egonw git checkout -b 101-smsdRebase master
12:39 egonw first should be by now, (as that branch already exists): git checkout master
12:39 Asad_ asad:cdk-smsd Asad$ git checkout -b 101-smsdRebase
12:39 Asad_ fatal: git checkout: branch 101-smsdRebase already exists
12:39 Asad_ asad:cdk-smsd Asad$ git checkout -b 101-smsdRebase
12:39 Asad_ fatal: git checkout: branch 101-smsdRebase already exists
12:39 Asad_ asad:cdk-smsd Asad$ git branch -D 101-smsdRebase
12:39 Asad_ Deleted branch 101-smsdRebase (was eaee919).
12:39 Asad_ asad:cdk-smsd Asad$ git checkout -b 101-smsdRebase master
12:39 Asad_ Switched to a new branch '101-smsdRebase'
12:39 Asad_ asad:cdk-smsd Asad$
12:40 egonw ok, what branch are you on right now?
12:40 egonw 'git branch'
12:40 egonw the one with the *
12:40 Asad_ * 101-smsdRebase
12:40 Asad_ master
12:40 Asad_ smsd
12:40 egonw no, just give me all output of 'git branch'...
12:40 egonw ah, perfect
12:40 egonw ok, do:
12:40 egonw git checkout master
12:40 egonw git branch -D 101-smsdRebase
12:40 egonw git checkout -b 101-smsdRebase master
12:41 Asad_ asad:cdk-smsd Asad$ git branch -D 101-smsdRebase
12:41 Asad_ Deleted branch 101-smsdRebase (was 6d453a1).
12:41 Asad_ asad:cdk-smsd Asad$ git checkout -b 101-smsdRebase master
12:41 Asad_ Switched to a new branch '101-smsdRebase'
12:42 egonw good :)
12:42 Asad_ :)
12:42 Asad_ so
12:42 Asad_ I am following like a student
12:42 egonw git am --whitespace=nowarn smsd-patches/0001-added-SMSD-Small-Mol​ecule-Subgraph-Detector-toolkit.patch
12:42 * egonw is very often finding google a good tutor :)
12:43 Asad_ git am --whitespace=nowarn smsd-patches/0001-added-SMSD-Small-Mol​ecule-Subgraph-Detector-toolkit.patch
12:43 Asad_ Applying: added SMSD(Small Molecule Subgraph Detector) toolkit
12:43 egonw git am --whitespace=nowarn smsd-patches/0003-Changed-Vector-foo-t​o-List-foo-wherever-appropriate.patch
12:43 Asad_ sure I have one right infront
12:43 Asad_ on chat
12:43 egonw git am smsd-patches/0005-SMSD-isS​ubgraph-code-updated.patch
12:43 egonw with --whitespace=nowarn if you like
12:43 Asad_ Asad$ git am --whitespace=nowarn smsd-patches/0003-Changed-Vector-foo-t​o-List-foo-wherever-appropriate.patch
12:43 Asad_ Applying: Changed Vector<foo> to List<foo> wherever appropriate
12:44 Asad_ git am --whitespace=nowarn smsd-patches/0005-SMSD-isS​ubgraph-code-updated.patch
12:44 Asad_ Applying: SMSD isSubgraph code updated
12:44 Asad_ great
12:44 egonw 0006 applied cleanly too
12:45 Asad_ yes
12:45 Asad_ d:)
12:45 egonw so does 7-10
12:46 egonw and 11-17
12:46 egonw 0018 is the first next to fail
12:46 Asad_ okay I am in 10th
12:46 egonw ok, please proceed to 17
12:47 Asad_ done 17th
12:47 egonw good
12:47 egonw 18 fails because the build.xml is changed, making 0018 to not apply cleanly again...
12:47 egonw ok, do you have the kdiff3 program?
12:48 egonw you're on Linux, right?
12:48 Asad_ mac
12:48 egonw ah
12:48 egonw ok...
12:48 egonw mom...
12:48 Asad_ I have diff
12:48 Asad_ :-)
12:48 egonw that's not quite the same :)
12:48 Asad_ and diff3
12:48 Asad_ too
12:48 egonw google for kdiff3
12:48 zarah egonw: http://kdiff3.sourceforge.net/
12:49 egonw check it...
12:49 egonw it's a nice tool
12:49 egonw allows you to nicely merge/fix patches with git
12:49 egonw there actually is a OSX binary
12:50 Asad_ yes downloading it
12:50 Asad_ downloaded
12:51 Asad_ now
12:51 Asad_ what to do
12:51 egonw yeah, trying to figure that out...
12:51 egonw this is the normal situation:
12:51 egonw - you apply the patch with 'git am'...
12:52 egonw leading to conflicts which you can then fix with:
12:52 egonw git mergetool
12:52 egonw BUT
12:52 egonw the thing says there is nothing to fix...
12:52 Asad_ oh
12:52 egonw so, trying to figure out why that is right now...
12:53 egonw ok, do this:
12:53 Asad_ yes
12:53 egonw edit the 0018-foo.patch file
12:53 egonw and remove the lines (including):
12:53 egonw diff --git a/build.xml b/build.xml
12:53 egonw to (excluding):
12:53 egonw diff --git a/src/META-INF/test-smsd.cdkdepends b/src/META-INF/test-smsd.cdkdepends
12:53 egonw (so, that second line should be kept)
12:54 egonw this effectively removes the patch on the build.xml
12:54 egonw which was the conflict
12:54 Asad_ slightly confused
12:54 egonw how so?
12:54 Asad_ could you please send the edited file
12:54 egonw yes
12:54 egonw hang on...
12:57 egonw OK, sent
12:58 egonw I actually send a 'fixed' patch that also correctly updates the build.xml
12:58 egonw which is why it took a bit longer
12:59 Asad_ git am --whitespace=nowarn smsd-patches/0018-Set-up-a-smsd-test-module.patch Applying: Set up a smsd test module
12:59 Asad_ awesome!
12:59 egonw you renamed the file I sent?
12:59 Asad_ yes
12:59 egonw ok :)
12:59 egonw ok, same kind of issue for 0019
13:00 Asad_ I just replaced the contents
13:00 Asad_ hmm
13:00 egonw yes, perfect
13:01 Asad_ well then you are the guide..let me know what to do!  8)
13:01 egonw well, same bloody problem...
13:02 egonw git am does not apply the bits it can apply... :(
13:02 egonw need to manually solve the problem
13:02 egonw not sure what's changed in 1.6.3.3 :(
13:02 egonw but I don't like it :(
13:02 Asad_ hmm without you around, I would have messed up my normal repos too!
13:03 egonw that's actually quite hard :)
13:03 egonw any commit you ever mind is typically saved
13:03 egonw though recovering them is not always easy, it is always possible :)
13:03 Asad_ I believe u
13:04 * egonw is thinking about upgrading his git installation
13:04 egonw mom
13:06 * egonw is upgrading git to 1.6.5.7
13:06 egonw and hoping that will bring back normal 'git am' behaviour
13:07 Asad_ okay let me check my version
13:07 egonw allowing me to 'git mergetool' again
13:07 Asad_ git version 1.6.5.5
13:07 egonw btw, these are the harded patches...
13:07 Asad_ thats my version
13:07 egonw as the build files change more often in subtle ways
13:07 egonw yes, that sounds good
13:08 Asad_ I agree
13:08 egonw ok, that did not make any difference...
13:08 egonw hang on... I'll rewrite the patch now...
13:08 Asad_ okay
13:11 egonw sorry, was interupted by a phone call
13:11 Asad_ oh
13:11 Asad_ np
13:12 Asad_ I too need 5 mins break, be right back in 5 mins
13:12 Asad_ :-)
13:12 egonw ack
13:18 Asad_ yes
13:18 Asad_ back
13:19 egonw sent a new 0019
13:19 egonw 20-22 apply fine too
13:19 egonw 0023 does not
13:19 egonw which suprises me...
13:19 egonw because it only seems to have smsd related things
13:20 Asad_ git am --whitespace=nowarn smsd-patches/0019-Hooked-up-qualit​y-control-for-the-new-module.patch
13:20 Asad_ Applying: Hooked up quality control for the new module
13:21 Asad_ oh
13:21 Asad_ git am --whitespace=nowarn smsd-patches/0022-Moved-to-the-Cov​erageAnnotationTest-approach.patch
13:21 Asad_ Applying: Moved to the CoverageAnnotationTest approach
13:21 Asad_ whats the error?
13:22 egonw 0023 does not apply
13:22 egonw has conflicts
13:22 Asad_ well that should work as its just a conversion!
13:22 Asad_ hmm
13:23 Asad_ any thoughts?
13:23 egonw yes
13:23 egonw ok, apply 20, 21 and 22 one by one
13:23 Asad_ did
13:24 egonw grmph...
13:24 egonw OK, I need 30 minutes before it is dark
13:24 egonw to do some work around the house
13:24 egonw outside
13:24 Asad_ sure
13:26 egonw bbl
13:27 Asad_ okay
13:58 egonw back
14:02 Asad_ yes
14:03 Asad_ so whats the next step
14:03 egonw fix 0023
14:04 Asad_ hmm
14:06 egonw ok, asking on #git ...
14:06 Asad_ well
14:06 Asad_ :-)
14:17 Asad_ be right back in 10 min
14:17 Asad_ if its doen plz e-mail me
14:18 Asad_ I will be online in 10 mins
14:18 egonw ack
14:25 carsten joined #cdk
14:33 egonw Asad_: ok, almost done with 0023
14:39 Asad_ okay
14:40 Asad_ iam back
14:41 egonw see email
14:41 egonw 24-26 apply fine
14:41 Asad_ did 23
14:42 Asad_ git am --whitespace=nowarn smsd-patches/0024-Added-similarity-met​hods-to-the-similarity-package-s.patch
14:42 Asad_ Applying: Added similarity methods to the similarity package so that we can drop the EBI Similarity class (even though it is not actually used in the other SMSD classes)
14:43 Asad_ I got this error
14:43 Asad_ git am --whitespace=nowarn smsd-patches/0025-SMSD-formatting.patch
14:43 Asad_ Applying: SMSD formatting
14:43 Asad_ error: patch failed: src/main/org/openscience/cdk/sm​sd/SubStructureFactory.java:322
14:43 Asad_ error: src/main/org/openscience/cdk/s​msd/SubStructureFactory.java: patch does not apply
14:43 Asad_ Patch failed at 0001 SMSD formatting
14:43 Asad_ When you have resolved this problem run "git am --resolved".
14:43 Asad_ If you would prefer to skip this patch, instead run "git am --skip".
14:43 Asad_ To restore the original branch and stop patching run "git am --abort".
14:43 Asad_ asad:cdk-smsd Asad$ git am --whitespace=nowarn smsd-patches/0026-SMSD-formatting.patch
14:43 Asad_ previous rebase directory /Users/Asad/Software/GITROOT​/cdk-smsd/.git/rebase-apply still exists but mbox given.
14:44 egonw that patch was fine for me :(
14:44 Asad_ oh
14:44 Asad_ can I start from 24th again?
14:45 egonw git am --abort
14:45 bag joined #cdk
14:45 Asad_ git am --abort
14:45 Asad_ asad:cdk-smsd Asad$ git am --whitespace=nowarn smsd-patches/0024-Added-similarity-met​hods-to-the-similarity-package-s.patch
14:45 Asad_ Applying: Added similarity methods to the similarity package so that we can drop the EBI Similarity class (even though it is not actually used in the other SMSD classes)
14:45 Asad_ error: src/main/org/openscience/c​dk/similarity/Cosine.java: already exists in index
14:45 Asad_ error: src/main/org/openscience/cdk/similarity/Dice.java: already exists in index
14:45 Asad_ error: src/test/org/openscience/cdk​/similarity/CosineTest.java: already exists in index
14:45 Asad_ error: src/test/org/openscience/cd​k/similarity/DiceTest.java: already exists in index
14:45 Asad_ Patch failed at 0001 Added similarity methods to the similarity package so that we can drop the EBI Similarity class (even though it is not actually used in the other SMSD classes)
14:46 Asad_ When you have resolved this problem run "git am --resolved".
14:46 Asad_ If you would prefer to skip this patch, instead run "git am --skip".
14:46 Asad_ To restore the original branch and stop patching run "git am --abort".
14:46 egonw git am --abort
14:47 egonw ah... but 0024 did apply properly the first time, not?
14:47 Asad_ yes
14:47 egonw so, no need to apply that one a second time
14:47 egonw that's causing these conflicts
14:47 Asad_ so what to do
14:47 egonw OK, I'm gonna a try another route...
14:48 Asad_ ok
14:48 Asad_ ur call
14:49 egonw OK, this is how you would do it otherwise...
14:49 egonw and that seems to work much better
14:49 egonw on top of faster
14:49 egonw I wanted to not use that route
14:49 Asad_ okay
14:49 egonw as it often requires a bit more hand work...
14:50 egonw but since we have to do more hand work than I expected anyway...
14:50 egonw ok, try this:
14:50 egonw git am --abort
14:50 Asad_ indeed
14:50 egonw git branch
14:50 egonw please return me the output of that command
14:50 Asad_ git branch
14:50 Asad_ * 101-smsdRebase
14:50 Asad_ master
14:50 Asad_ smsd
14:51 egonw ok
14:51 egonw git checkout -b 102-smsdRebase smsd
14:51 egonw then
14:51 egonw git rebase master
14:51 egonw now, this will fail often, and repeatedly...
14:51 Asad_ git checkout -b 102-smsdRebase smsd
14:51 Asad_ Switched to a new branch '102-smsdRebase'
14:51 egonw but actually not as often as this afternoon
14:52 egonw ending up with a half applied patch after this message:
14:52 egonw Patch failed at 0017 Hooked up quality control for the new module
14:52 egonw When you have resolved this problem run "git rebase --continue".
14:52 egonw If you would prefer to skip this patch, instead run "git rebase --skip".
14:52 egonw To restore the original branch and stop rebasing run "git rebase --abort".
14:53 egonw in that situation, you do:
14:53 egonw git mergetool
14:53 egonw which will ask you for a tool to merge with...
14:53 Asad_ git mergetool
14:53 Asad_ merge tool candidates: opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse ecmerge araxis emerge vimdiff
14:53 Asad_ Merging the files: build.xml
14:53 Asad_ Normal merge conflict for 'build.xml':
14:53 egonw that's where you choose kdiff3
14:54 Asad_ {local}: modified
14:54 Asad_ {remote}: modified
14:54 Asad_ Hit return to start merge resolution tool (opendiff):
14:54 egonw yes, right
14:54 egonw don't return enter
14:54 egonw but
14:54 egonw type kdiff3
14:54 egonw and then enter
14:54 Asad_ yes
14:54 Asad_ do you have skype account
14:55 Asad_ I can share my screen
14:55 Asad_ it shows 17 differences
14:55 egonw yes, but no sound...
14:55 egonw mom
14:55 egonw let's see if that works...
14:55 Asad_ 16 left, 2 right 1 conflict
16:23 egonw bbl
16:25 Asad_ joined #cdk
16:25 slyrus joined #cdk
16:50 Asad joined #cdk
19:30 Asad joined #cdk
19:34 Guest72162 HI
19:34 zarah saluton Guest72162
20:15 Guest72162 left #cdk
22:34 jpansanel joined #cdk
22:36 Asad joined #cdk
22:36 Guest24368 left #cdk

| Channels | #cdk index | Today | | Search | Google Search | Plain-Text | summary