GNU bug report logs - #24776
smerge-mode: smerge-swap doesn't swap hunk badges

Previous Next

Package: emacs;

Reported by: Aleksey Midenkov <midenok <at> gmail.com>

Date: Sun, 23 Oct 2016 17:31:02 UTC

Severity: normal

Tags: moreinfo

Done: Lars Ingebrigtsen <larsi <at> gnus.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 24776 in the body.
You can then email your comments to 24776 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to bug-gnu-emacs <at> gnu.org:
bug#24776; Package emacs. (Sun, 23 Oct 2016 17:31:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Aleksey Midenkov <midenok <at> gmail.com>:
New bug report received and forwarded. Copy sent to bug-gnu-emacs <at> gnu.org. (Sun, 23 Oct 2016 17:31:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Aleksey Midenkov <midenok <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: smerge-mode: smerge-swap doesn't swap hunk badges
Date: Sun, 23 Oct 2016 21:57:08 +0700
### Original:
```c++
<<<<<<< cbfd48f66c91c6f608359dd73d7c82d4793e95e6

/** Update the record for space_id in SYS_TABLESPACES to this filepath.
@param[in]      space_id        Tablespace ID
@param[in]      filepath        Tablespace filepath
@return DB_SUCCESS if OK, dberr_t if the insert failed */
=======
/********************************************************************//**
This function parses a SYS_VTQ record, extracts necessary
information from the record and returns it to the caller.
@return error message, or NULL on success */
UNIV_INTERN
const char*
dict_process_sys_vtq(
/*=======================*/
mem_heap_t*     heap,           /*!< in/out: heap memory */
const rec_t*    rec,            /*!< in: current rec */
ullong*         col_trx_id,     /*!< out: field values */
ullong*         col_begin_ts,
ullong*         col_commit_ts,
ullong*         col_concurr_trx);
/********************************************************************//**
Get the filepath for a spaceid from SYS_DATAFILES. This function provides
a temporary heap which is used for the table lookup, but not for the path.
The caller must free the memory for the path returned. This function can
return NULL if the space ID is not found in SYS_DATAFILES, then the caller
will assume that the ibd file is in the normal datadir.
@return own: A copy of the first datafile found in SYS_DATAFILES.PATH for
the given space ID. NULL if space ID is zero or not found. */
UNIV_INTERN
char*
dict_get_first_path(
/*================*/
        ulint           space,  /*!< in: space id */
        const char*     name);  /*!< in: tablespace name */
/********************************************************************//**
Update the record for space_id in SYS_TABLESPACES to this filepath.
@return DB_SUCCESS if OK, dberr_t if the insert failed */
UNIV_INTERN
>>>>>>> IB: 0.2 part I
```

### After swap:
```c++
<<<<<<< cbfd48f66c91c6f608359dd73d7c82d4793e95e6
/********************************************************************//**
This function parses a SYS_VTQ record, extracts necessary
information from the record and returns it to the caller.
@return error message, or NULL on success */
UNIV_INTERN
const char*
dict_process_sys_vtq(
/*=======================*/
mem_heap_t*     heap,           /*!< in/out: heap memory */
const rec_t*    rec,            /*!< in: current rec */
ullong*         col_trx_id,     /*!< out: field values */
ullong*         col_begin_ts,
ullong*         col_commit_ts,
ullong*         col_concurr_trx);
/********************************************************************//**
Get the filepath for a spaceid from SYS_DATAFILES. This function provides
a temporary heap which is used for the table lookup, but not for the path.
The caller must free the memory for the path returned. This function can
return NULL if the space ID is not found in SYS_DATAFILES, then the caller
will assume that the ibd file is in the normal datadir.
@return own: A copy of the first datafile found in SYS_DATAFILES.PATH for
the given space ID. NULL if space ID is zero or not found. */
UNIV_INTERN
char*
dict_get_first_path(
/*================*/
        ulint           space,  /*!< in: space id */
        const char*     name);  /*!< in: tablespace name */
/********************************************************************//**
Update the record for space_id in SYS_TABLESPACES to this filepath.
@return DB_SUCCESS if OK, dberr_t if the insert failed */
UNIV_INTERN
=======

/** Update the record for space_id in SYS_TABLESPACES to this filepath.
@param[in]      space_id        Tablespace ID
@param[in]      filepath        Tablespace filepath
@return DB_SUCCESS if OK, dberr_t if the insert failed */
>>>>>>> IB: 0.2 part I
```

### Expected:
```c++
<<<<<<< IB: 0.2 part I
/********************************************************************//**
This function parses a SYS_VTQ record, extracts necessary
information from the record and returns it to the caller.
@return error message, or NULL on success */
UNIV_INTERN
const char*
dict_process_sys_vtq(
/*=======================*/
mem_heap_t*     heap,           /*!< in/out: heap memory */
const rec_t*    rec,            /*!< in: current rec */
ullong*         col_trx_id,     /*!< out: field values */
ullong*         col_begin_ts,
ullong*         col_commit_ts,
ullong*         col_concurr_trx);
/********************************************************************//**
Get the filepath for a spaceid from SYS_DATAFILES. This function provides
a temporary heap which is used for the table lookup, but not for the path.
The caller must free the memory for the path returned. This function can
return NULL if the space ID is not found in SYS_DATAFILES, then the caller
will assume that the ibd file is in the normal datadir.
@return own: A copy of the first datafile found in SYS_DATAFILES.PATH for
the given space ID. NULL if space ID is zero or not found. */
UNIV_INTERN
char*
dict_get_first_path(
/*================*/
        ulint           space,  /*!< in: space id */
        const char*     name);  /*!< in: tablespace name */
/********************************************************************//**
Update the record for space_id in SYS_TABLESPACES to this filepath.
@return DB_SUCCESS if OK, dberr_t if the insert failed */
UNIV_INTERN
=======

/** Update the record for space_id in SYS_TABLESPACES to this filepath.
@param[in]      space_id        Tablespace ID
@param[in]      filepath        Tablespace filepath
@return DB_SUCCESS if OK, dberr_t if the insert failed */
>>>>>>> cbfd48f66c91c6f608359dd73d7c82d4793e95e6
```




Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#24776; Package emacs. (Mon, 30 Nov 2020 11:50:01 GMT) Full text and rfc822 format available.

Message #8 received at 24776 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Aleksey Midenkov <midenok <at> gmail.com>
Cc: 24776 <at> debbugs.gnu.org
Subject: Re: bug#24776: smerge-mode: smerge-swap doesn't swap hunk badges
Date: Mon, 30 Nov 2020 12:49:19 +0100
Aleksey Midenkov <midenok <at> gmail.com> writes:

> ### Original:
> ```c++
> <<<<<<< cbfd48f66c91c6f608359dd73d7c82d4793e95e6
>
> /** Update the record for space_id in SYS_TABLESPACES to this filepath.
(etc)

(This bug report unfortunately got no response at the time.)

Do you have a recipe for reproducing this bug, starting from "emacs -Q"?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no




Added tag(s) moreinfo. Request was from Lars Ingebrigtsen <larsi <at> gnus.org> to control <at> debbugs.gnu.org. (Mon, 30 Nov 2020 11:50:01 GMT) Full text and rfc822 format available.

Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#24776; Package emacs. (Tue, 12 Jan 2021 20:34:02 GMT) Full text and rfc822 format available.

Message #13 received at 24776 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Aleksey Midenkov <midenok <at> gmail.com>
Cc: 24776 <at> debbugs.gnu.org
Subject: Re: bug#24776: smerge-mode: smerge-swap doesn't swap hunk badges
Date: Tue, 12 Jan 2021 21:33:13 +0100
Lars Ingebrigtsen <larsi <at> gnus.org> writes:

> Do you have a recipe for reproducing this bug, starting from "emacs -Q"?

More information was requested, but no response was given within a
month, so I doubt further progress will be made here, and I'm closing
this bug report.  If further progress can be made, please respond to
this email and we'll reopen the bug report.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no




bug closed, send any further explanations to 24776 <at> debbugs.gnu.org and Aleksey Midenkov <midenok <at> gmail.com> Request was from Lars Ingebrigtsen <larsi <at> gnus.org> to control <at> debbugs.gnu.org. (Tue, 12 Jan 2021 20:34:03 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 10 Feb 2021 12:24:06 GMT) Full text and rfc822 format available.

This bug report was last modified 4 years and 151 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.