Displaying #maven-dev/2017-01-21.log:

Sat Jan 21 09:40:52 2017  tibor_:Joined the channel
Sat Jan 21 10:58:47 2017  hboutemy:tibor_: do you have what you need to continue your work on Surefire?
Sat Jan 21 10:59:27 2017  tibor_:@hboutemy: Hi Herve. I have everything.
Sat Jan 21 10:59:41 2017  hboutemy:great
Sat Jan 21 10:59:46 2017  hboutemy:we need to go forward, now :)
Sat Jan 21 10:59:50 2017  tibor_:I will close the vote today.
Sat Jan 21 11:00:02 2017  hboutemy:no need to really "close" the vote
Sat Jan 21 11:00:22 2017  hboutemy:but, yes, acting that you'll do as proposed
Sat Jan 21 11:01:48 2017  tibor_:Is some other discussion regarding this in background i missed something?
Sat Jan 21 11:01:56 2017  hboutemy:no
Sat Jan 21 11:02:26 2017  tibor_:I will do the revert.
Sat Jan 21 11:02:46 2017  hboutemy:then go forward: perfect :)
Sat Jan 21 11:07:14 2017  tibor_:I will be at home for less than one hour. If I do not reply, it means I am outside with my father but I will be back after few hours.
Sat Jan 21 11:25:45 2017  rfscholte:Joined the channel
Sat Jan 21 14:13:36 2017  tibor_:Joined the channel
Sat Jan 21 15:25:17 2017  tibor_:@hboutemy: This did not succeed git revert --no-commit 780f91393046fd11129cd9ee5bd10ca1d59286f0
Sat Jan 21 15:25:30 2017  tibor_:error: Commit 780f91393046fd11129cd9ee5bd10ca1d59286f0 is a merge but no -m option was given.
Sat Jan 21 15:25:57 2017  tibor_:I am just trying to understand how to use the switch -m
Sat Jan 21 15:35:05 2017  hboutemy:I'm not really a git expert, particularly on CLI
Sat Jan 21 15:35:28 2017  hboutemy:didn't you try with your favorite IDE?
Sat Jan 21 15:42:00 2017  tibor_:I am using IDEA, but I trust CLI because I can see under the hood. I am not an expert either. I tried without --no-commit, but the same result. I have to read git revert spec.
Sat Jan 21 15:56:29 2017  tibor_:@hboutemy: now it works. Is it better to revert each commit separately or one revert for all 11 commits?
Sat Jan 21 15:56:57 2017  hboutemy:I'd say you can squash everything
Sat Jan 21 15:59:10 2017  tibor_:but the history 13 days ago with commits we want to revert will be stll in history. This is okay?
Sat Jan 21 16:01:56 2017  tibor_:I will check the content of sources against revision 66bc - it should be same with working copy after reverts
Sat Jan 21 16:20:17 2017  hboutemy:yes, history will still contain the original commits: that's not really a big issue for 11 commits staying around some stupid parts
Sat Jan 21 16:43:40 2017  tibor_:@hboutemy: revision 4d3673 failed hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit'
Sat Jan 21 16:44:01 2017  tibor_:I did reset locally, it works.
Sat Jan 21 16:44:17 2017  tibor_:but you loose history with 11 commits
Sat Jan 21 16:46:15 2017  tibor_:IDEA 14 is not able to revert but IDEA 16 can. I have to install it.
Sat Jan 21 16:50:30 2017  hboutemy:tibor_: you reverted commits or your resetted your local clone?
Sat Jan 21 16:51:28 2017  tibor_:i have several local clones and tried both several times - nothing pushed
Sat Jan 21 16:52:13 2017  hboutemy:then you managed to revert commits, isn't it?
Sat Jan 21 16:54:05 2017  tibor_:if you mean git reset then yes but history with last 11 commits will disappear and I wanted to be motivated by them and make better commits in bracnhes
Sat Jan 21 16:54:45 2017  hboutemy:no, I don't mean reset: I mean revert commits
Sat Jan 21 16:54:56 2017  tibor_:ah ok
Sat Jan 21 16:55:09 2017  tibor_:I did revert 11 commits
Sat Jan 21 16:55:10 2017  hboutemy:ie add new commits that revert previous commit content
Sat Jan 21 16:55:31 2017  hboutemy:(and eventually squash everything in 1 new revert commit)
Sat Jan 21 16:55:35 2017  tibor_:but one of them failed and I do not understand why
Sat Jan 21 16:55:52 2017  hboutemy:when it fails, you have too look at the failed content
Sat Jan 21 16:56:00 2017  hboutemy:do the merge (ie the fix)
Sat Jan 21 16:56:02 2017  tibor_:I sent you
Sat Jan 21 16:56:04 2017  hboutemy:then git add
Sat Jan 21 16:56:18 2017  hboutemy:(or git rm if the result is taht you want to completely drop the file)
Sat Jan 21 16:56:31 2017  tibor_:it's better if infra do it
Sat Jan 21 16:56:46 2017  hboutemy:no
Sat Jan 21 16:56:47 2017  tibor_:i do not want to break master
Sat Jan 21 16:57:00 2017  hboutemy:if infra does it, it breaks master
Sat Jan 21 16:57:06 2017  hboutemy:if you do it, you can't break master
Sat Jan 21 16:57:35 2017  hboutemy:(I mean infra breaks master *intentionnally*)
Sat Jan 21 16:57:49 2017  tibor_:error says that some file needs to be added but I do not see which one
Sat Jan 21 16:58:10 2017  hboutemy:git status
Sat Jan 21 16:58:18 2017  tibor_:i will try
Sat Jan 21 17:03:13 2017  hboutemy:wow, I have color back in Maven 3.5.0-SNAPSHOT
Sat Jan 21 17:03:21 2017  hboutemy::)
Sat Jan 21 17:08:23 2017  tibor_:cool, good work
Sat Jan 21 17:10:50 2017  tibor_:I will install latest IntelliJ IDEA 2016.3 for open souce without license.
Sat Jan 21 20:55:12 2017  tibor_:Joined the channel
Sat Jan 21 21:51:32 2017  olamy:Joined the channel
Sat Jan 21 22:06:08 2017  olamy:Joined the channel
Sat Jan 21 23:26:02 2017  olamy:Joined the channel

Comments