Eskil

Check-in [02a22eea17]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Do git add after conflict merge of a git file.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 02a22eea17e323590d504202eabadd510e54c51e
User & Date: peter 2010-04-27 19:29:22.000
Context
2010-04-27
19:29
Update path to kit. check-in: c19a334194 user: peter tags: trunk
19:29
Do git add after conflict merge of a git file. check-in: 02a22eea17 user: peter tags: trunk
2010-02-13
21:48
Better defaults for PDF colors. check-in: 2249caf67e user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Changes. 




1
2
3
4
5
6
7





2009-11-02
 Detect and display annotation in patches. E.g. when using -p with diff.

2009-10-17
 Return in rev field does a redo diff. [FR 4649]
 Allow zero lines of context to only show diffs.


>
>
>
>








1
2
3
4
5
6
7
8
9
10
11

2010-02-13
 Do git add after conflict merge of a git file.
 Select colors for PDF print.

2009-11-02
 Detect and display annotation in patches. E.g. when using -p with diff.

2009-10-17
 Return in rev field does a redo diff. [FR 4649]
 Allow zero lines of context to only show diffs.
︙︙
Changes to src/merge.tcl.
︙︙
245
246
247
248
249
250
251












252
253

254
255
256
257
258
259
260

            set ::diff($top,mergeFile) $apa
        }
    }

    set ch [open $::diff($top,mergeFile) "w"]
    puts -nonewline $ch [$w get 1.0 end-1char]
    close $ch












    tk_messageBox -parent $top.merge -icon info -type ok -title "Diff" \
            -message "Saved merge to file $::diff($top,mergeFile)."

}

# Close merge window and clean up.
proc closeMerge {top} {
    global diff

    destroy $top.merge








>
>
>
>
>
>
>
>
>
>
>
>
|
|
>








245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273

            set ::diff($top,mergeFile) $apa
        }
    }

    set ch [open $::diff($top,mergeFile) "w"]
    puts -nonewline $ch [$w get 1.0 end-1char]
    close $ch

    # Detect if this is a GIT merge, and possibly add it to the index
    # after save (i.e. git add file)
    if {[detectRevSystem $::diff($top,mergeFile)] eq "GIT"} {
        set apa [tk_messageBox -parent $top.merge -icon info -type yesno \
                -title "Diff" \
                -message "Saved merge to file $::diff($top,mergeFile).\nAdd\
                it to GIT index?"]
        if {$apa eq "yes"} {
            eskil::rev::GIT::add $::diff($top,mergeFile)
        }
    } else {
        tk_messageBox -parent $top.merge -icon info -type ok -title "Diff" \
                -message "Saved merge to file $::diff($top,mergeFile)."
    }
}

# Close merge window and clean up.
proc closeMerge {top} {
    global diff

    destroy $top.merge
︙︙