è€åã§ãã
2017幎12æ29æ¥ 12:07 ohira <
shin....@gmail.com>:
> ããã²ãã§ãã
>
> 以äžã®ãããªç¶æ³ã§ãã
>
> ...
> ...
> ...
> (base other local å
±é)
> (base other å
±é)(local å¥) <---------- ãããã
> (base other å
±é)(local å¥)
> (base other å
±é)(local å¥)
> (base other å
±é)(local å¥)
> (base å¥)(other å¥)(local å¥) (ãã®è¡ã ãã³ã³ããªã¯ãã§è¯ããããªæ°ãããŸãã)
> (base other å
±é)(local å¥)
> (base other å
±é)(local å¥)
> (base other å
±é)(local å¥)
> (base other å
±é)(local å¥) <---------- ãããŸã§ãã³ã³ããªã¯ãã®å¯Ÿè±¡
> (base other local å
±é)
> ...
> ...
> ...
äžèšã®æåã¯æ³å®éãã®ãã®ã§ãã
Mercurial ã® builtin ããŒãžåŠç (= Python ã®æšæºã©ã€ãã©ãªã®æå)
ããdiff3 (GNU diffutils) çã® CUI 3-way ããŒãžããŒã«ã¯ãåçŽã«
ãè¡ããšã®æååã®äžèŽïŒäžäžèŽãã§å€æŽã®æç¡ãå€å®ããŠããŸãã
ãã®ããããlocal åŽã®å€æŽå
容ã (= äžèšäŸã«ãããã(base other å
±
é)(local å¥)ããªè¡) ãããother ã«ãšã£ãŠåŠ¥åœãªå
容ãåŠãããå€å®
ããããšãã§ããŸããã
è¡çªå
容ã®æžãåºãã®éã«ãç¡çã«è¡çªç¯å²ãçãããããããšã³ããŠãŒ
ã¶ã®å€æã«ä»»ããæ¹ãå®å
šã§ããããšããã®ã¯ã劥åœãªéžæã ãšæããŸãã
ããã²ãããã®ããã®è¡ã ãã³ã³ããªã¯ãã§è¯ããããªæ°ãããŸããããš
ããææ³ã:
- local åŽã®å€æŽã¯ããå
é ã®æååãå§ãŸããŸã§ã®ç©ºçœãäžã€åé€ãx35è¡
- other åŽã®å€æŽã¯ããè¡ã®äžå€®éšåã®ãã£ã©ã¯ã¿ãåé€ãx1è¡
ãšããããå€æŽå
容ã«å¯Ÿããç解ããã£ãŠã®ãã®ã ãšæããŸãã
ãããããããå€æŽå
容ãäžæã㪠35 è¡ (local) + 1è¡ (other) ã ãš
ããããããã®è¡ã ãã³ã³ããªã¯ãã§è¯ãããããšã¯æããªãã®ã§ã¯ãªã
ããš (ç¬)
ãã®ãããã®ãå
容ãç解ããŠããèŠç¹ã§èŠãå Žåã®ãè¡çªæ€åºã®åé·æ§ã
ã®åé¡ã¯ãæ¬ ML ã§ã以å觊ããŸãããããã¡ã€ã«å
容ãç解ã§ããããŒ
ãžåŠçããããã semantic merge ãå¯èœãªããŒã«ãå¿
èŠã§ããããã
æ«ãåã«ãWindows ç°å¢ïŒ C#, VB.net, Java, C èšèªéå®ã§ã¯ãããŸã
ããsemantic merge ãè¡ãããã®åããã°ã SemanticMerge ãªãããŒã«
ã®ååšãç¥ããŸããã
https://www.semanticmerge.com/
Mercurial åãèšå®æ¹æ³ã®èª¬æããããŸãã
https://users.semanticmerge.com/documentation/how-to-configure/semanticmerge-configuration-guide.shtml#HowtoconfigurewithMercurial
2.0 ãªãªãŒã¹ã§ã¯ã以äžã®å¯Ÿå¿ãäºå®ãããŠãããšã®ããšãªã®ã§ãå°å
¥ã
èŠéã«å
¥ã£ãŠãã人ãå¢ããã®ã§ã¯ïŒ
- åäœç°å¢ã« OSX/Linux ãè¿œå
- C++, Objective-C, JavaScript 察å¿
> simplemerge ã§ããã·ã¥è¡šç€ºããŠãåãããã·ã¥ã ãã©å³å¯ã«ã¯è¡ã®å
> 容éããšããå¯èœæ§ã¯ããã®ã§ãããã?
--
----------------------------------------------------------------------
FUJIWARA Katsunori(
flying...@gmail.com)