Или вот вам, реальное проишествие, сегодня с утра было потрачено около часа на то, чтобы просто проапдейтить мою локальную копию... (в итоге часть сорцев пришлось пересылать по почте и т.п.)
wvxvw@wvxvw-desktop:~/Projects/rounds$ git pull
remote: Counting objects: 144, done.
remote: Compressing objects: 100% (72/72), done.
remote: Total 73 (delta 54), reused 0 (delta 0)
Unpacking objects: 100% (73/73), done.
From github.com:gadisr/rounds
c410ef7..ca69521 master -> origin/master
Auto-merging LIB/com/gixoo/view/GixooSimpleButton.as
Auto-merging VideoRound/com/gixoo/videoRound/controllers/ViewController.as
Auto-merging VideoRound/com/gixoo/videoRound/net/p2p/P2PStream.as
Auto-merging VideoRound/com/gixoo/videoRound/view/VideoRoundView.as
CONFLICT (content): Merge conflict in VideoRound/com/gixoo/videoRound/view/VideoRoundView.as
Auto-merging VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentView.as
CONFLICT (content): Merge conflict in VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentView.as
Automatic merge failed; fix conflicts and then commit the result.
wvxvw@wvxvw-desktop:~/Projects/rounds$ git commit -a
[master eaee5a5] Merge branch 'master' of github.com:gadisr/rounds
wvxvw@wvxvw-desktop:~/Projects/rounds$ git log VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
commit 7684a3d26e077cd636bb62399f82324084a1631c
Author: Yogev Shelly <yogev@rounds.com>
Date: Wed Jan 19 10:15:02 2011 +0200
stream changes
commit ad36371cb40a25b98c43e8b3bac476a78fe589db
Author: Yogev Shelly <yogev@rounds.com>
Date: Mon Nov 29 16:41:24 2010 +0200
added lib and videoRound - tcp version
wvxvw@wvxvw-desktop:~/Projects/rounds$ git log -p VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
commit 7684a3d26e077cd636bb62399f82324084a1631c
Author: Yogev Shelly <yogev@rounds.com>
Date: Wed Jan 19 10:15:02 2011 +0200
stream changes
diff --git a/VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as b/VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
index 0fc1a81..1304c31 100644
--- a/VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
+++ b/VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
@@ -31,19 +31,10 @@ package com.gixoo.videoRound.view.participant.opponentView
*/
//Add remove code
- if(ns == null)
- {
- if(neaveNs)
- {
- if(contains(neaveNs))
- removeChild(neaveNs);
- }
- }
- else if(neaveNs)
- {
- if(!contains(neaveNs))
- addChild(neaveNs);
- }
+ if(!ns && neaveNs && contains(neaveNs))
+ removeChild(neaveNs);
+ else if(neaveNs && !contains(neaveNs))
+ addChild(neaveNs);
//Set NS code
if(!neaveNs)
@@ -69,7 +60,6 @@ package com.gixoo.videoRound.view.participant.opponentView
neaveNs.activateEffects(EffectType[effectType] != EffectType.NORMAL)
neaveNs.effects.effectType = EffectType[effectType];
neaveNs.activateEffects(EffectType[effectType] != EffectType.NORMAL)
-
}
private function handleEffectFailed(evt:Event):void
wvxvw@wvxvw-desktop:~/Projects/rounds$ git whatchanged -p VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
commit 7684a3d26e077cd636bb62399f82324084a1631c
Author: Yogev Shelly <yogev@rounds.com>
Date: Wed Jan 19 10:15:02 2011 +0200
stream changes
diff --git a/VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as b/VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
index 0fc1a81..1304c31 100644
--- a/VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
+++ b/VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
@@ -31,19 +31,10 @@ package com.gixoo.videoRound.view.participant.opponentView
*/
//Add remove code
- if(ns == null)
- {
- if(neaveNs)
- {
- if(contains(neaveNs))
- removeChild(neaveNs);
- }
- }
- else if(neaveNs)
- {
- if(!contains(neaveNs))
- addChild(neaveNs);
- }
+ if(!ns && neaveNs && contains(neaveNs))
+ removeChild(neaveNs);
+ else if(neaveNs && !contains(neaveNs))
+ addChild(neaveNs);
//Set NS code
if(!neaveNs)
@@ -69,7 +60,6 @@ package com.gixoo.videoRound.view.participant.opponentView
neaveNs.activateEffects(EffectType[effectType] != EffectType.NORMAL)
neaveNs.effects.effectType = EffectType[effectType];
neaveNs.activateEffects(EffectType[effectType] != EffectType.NORMAL)
-
}
private function handleEffectFailed(evt:Event):void
wvxvw@wvxvw-desktop:~/Projects/rounds$ git diff head -- VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
fatal: bad revision 'head'
wvxvw@wvxvw-desktop:~/Projects/rounds$ git diff HEAD -- VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
wvxvw@wvxvw-desktop:~/Projects/rounds$ git commit -v
# On branch master
# Your branch is ahead of 'origin/master' by 3 commits.
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .build.xml.swp
# LIB/.project
. . .
# obsolete/logger/
nothing added to commit but untracked files present (use "git add" to track)
wvxvw@wvxvw-desktop:~/Projects/rounds$ git diff
wvxvw@wvxvw-desktop:~/Projects/rounds$ git difftool
wvxvw@wvxvw-desktop:~/Projects/rounds$ git diftool
git: 'diftool' is not a git command. See 'git --help'.
Did you mean this?
difftool
wvxvw@wvxvw-desktop:~/Projects/rounds$ git diftool --help
No manual entry for gitdiftool
wvxvw@wvxvw-desktop:~/Projects/rounds$ git difftool --help
wvxvw@wvxvw-desktop:~/Projects/rounds$ git pull
Already up-to-date.
wvxvw@wvxvw-desktop:~/Projects/rounds$ git blame VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
ad36371c (Yogev Shelly 2010-11-29 16:41:24 +0200 1) package com.gixoo.videoRound.view.participant.opponentView
... реальное содержание файла вырезано ...
ad36371c (Yogev Shelly 2010-11-29 16:41:24 +0200 73) }
wvxvw@wvxvw-desktop:~/Projects/rounds$ git push
Counting objects: 116, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (62/62), done.
Writing objects: 100% (64/64), 7.83 KiB, done.
Total 64 (delta 43), reused 0 (delta 0)
To git@github.com:gadisr/rounds.git
ca69521..eaee5a5 master -> master
wvxvw@wvxvw-desktop:~/Projects/rounds$ git blame VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentVideo.as
ad36371c (Yogev Shelly 2010-11-29 16:41:24 +0200 1) package com.gixoo.videoRound.view.participant.opponentView
... реальное содержание файла вырезано ...
ad36371c (Yogev Shelly 2010-11-29 16:41:24 +0200 73) }
wvxvw@wvxvw-desktop:~/Projects/rounds$ git log
commit eaee5a580210ccd058671fc79de054cbc80fe3d5
Merge: 1668281 ca69521
Author: wvxvw <oleg@rounds.com>
Date: Wed Jan 19 10:56:07 2011 +0200
Merge branch 'master' of github.com:gadisr/rounds
Conflicts:
VideoRound/com/gixoo/videoRound/view/VideoRoundView.as
VideoRound/com/gixoo/videoRound/view/participant/opponentView/OpponentView.as
commit ca6952120620b38168a3d772a01190ee94c92194
Merge: 7684a3d c410ef7
Author: Yogev Shelly <yogev@rounds.com>
Date: Wed Jan 19 10:17:47 2011 +0200
Merge branch 'master' of github.com:gadisr/rounds
Conflicts:
VideoRound/com/gixoo/videoRound/net/tcp/TcpClient.as
commit 7684a3d26e077cd636bb62399f82324084a1631c
Author: Yogev Shelly <yogev@rounds.com>
Date: Wed Jan 19 10:15:02 2011 +0200
stream changes
commit 1668281f71e3c6ff8b7c06fdd735edd5655399c8
Author: wvxvw <oleg@rounds.com>
Date: Tue Jan 18 14:25:41 2011 +0200
Couple of cosmetic changes in VideoRoundView
commit 15ee9d379e03d333cfb11787eb779ec5f942250f
Author: wvxvw <oleg@rounds.com>
Date: Tue Jan 18 10:22:06 2011 +0200
Rewriting ChatData so it could send > and < signs
commit c410ef7ef145a84b96a9f8997ae6322c75ba4cc7
Author: wvxvw <oleg@rounds.com>
Date: Mon Jan 17 11:28:26 2011 +0200
wvxvw@wvxvw-desktop:~/Projects/rounds$ git push
^C
wvxvw@wvxvw-desktop:~/Projects/rounds$ git push origin master
Everything up-to-date
wvxvw@wvxvw-desktop:~/Projects/rounds$