unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / Atom feed
* bug#24776: smerge-mode: smerge-swap doesn't swap hunk badges
@ 2016-10-23 14:57 Aleksey Midenkov
  2020-11-30 11:49 ` Lars Ingebrigtsen
  0 siblings, 1 reply; 3+ messages in thread
From: Aleksey Midenkov @ 2016-10-23 14:57 UTC (permalink / raw)
  To: 24776

### 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
```





^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#24776: smerge-mode: smerge-swap doesn't swap hunk badges
  2016-10-23 14:57 bug#24776: smerge-mode: smerge-swap doesn't swap hunk badges Aleksey Midenkov
@ 2020-11-30 11:49 ` Lars Ingebrigtsen
  2021-01-12 20:33   ` Lars Ingebrigtsen
  0 siblings, 1 reply; 3+ messages in thread
From: Lars Ingebrigtsen @ 2020-11-30 11:49 UTC (permalink / raw)
  To: Aleksey Midenkov; +Cc: 24776

Aleksey Midenkov <midenok@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





^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#24776: smerge-mode: smerge-swap doesn't swap hunk badges
  2020-11-30 11:49 ` Lars Ingebrigtsen
@ 2021-01-12 20:33   ` Lars Ingebrigtsen
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Ingebrigtsen @ 2021-01-12 20:33 UTC (permalink / raw)
  To: Aleksey Midenkov; +Cc: 24776

Lars Ingebrigtsen <larsi@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





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-01-12 20:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-23 14:57 bug#24776: smerge-mode: smerge-swap doesn't swap hunk badges Aleksey Midenkov
2020-11-30 11:49 ` Lars Ingebrigtsen
2021-01-12 20:33   ` Lars Ingebrigtsen

unofficial mirror of bug-gnu-emacs@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/emacs-bugs/0 emacs-bugs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 emacs-bugs emacs-bugs/ https://yhetil.org/emacs-bugs \
		bug-gnu-emacs@gnu.org
	public-inbox-index emacs-bugs

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.yhetil.org/yhetil.emacs.bugs
	nntp://news.gmane.io/gmane.emacs.bugs


AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git